diff --git a/src/components/doctorCheck/PatientRegisterListBak.vue b/src/components/doctorCheck/PatientRegisterListBak.vue
deleted file mode 100644
index 242c786..0000000
--- a/src/components/doctorCheck/PatientRegisterListBak.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-<template>
-  <div>
-    <!-- 查询条件 -->
-    <div style="display: flex; flex-wrap: wrap; width: 100%">
-      <div class="block query">
-        <span class="demonstration">登记日期：</span>
-        <el-date-picker v-model="patientRegister.query.dateRange" type="daterange" align="right" unlink-panels
-          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
-          style="width: 240px">
-        </el-date-picker>
-      </div>
-      <div class="query">
-        <span>条码号：</span>
-        <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
-          style="width: 150px" />
-      </div>
-      <div class="query">
-        <span>档案号：</span>
-        <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
-          style="width: 135px" />
-      </div>
-      <div class="query">
-        <span>姓名：</span>
-        <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
-          style="width: 100px" />
-      </div>
-      <div class="query">
-        <span>性别：</span>
-        <el-select v-model="patientRegister.query.sex" placeholder="请选择" clearable style="width: 80px" 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>身份证号：</span>
-        <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
-          style="width: 180px" />
-      </div>
-      <div class="query">
-        <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll" :props="{
-          checkStrictly: true,
-          expandTrigger: 'hover',
-          ...customerOrg.treeprops,
-        }" :show-all-levels="false" size="small" clearable placeholder="请选择单位">
-        </el-cascader>
-        <el-checkbox v-model="patientRegister.query.customerOrgFlag">单位作为查询条件</el-checkbox>
-      </div>
-      <div class="query">
-        <span>状态：</span>
-        <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
-          size="small">
-          <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-    </div>
-
-    <!-- 人员列表 -->
-    <div style="display: flex;margin-top: 10px;">
-      <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
-        <el-table-column type="selection" width="40">
-
-        </el-table-column>
-        <el-table-column prop="completeFlag" label="体检进度">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁住">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgParentName" label="单位" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgName" label="部门" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="patientName" label="姓名" />
-        <el-table-column prop="sexId" label="性别">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="age" label="年龄" />
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
-        <el-table-column prop="patientNo" label="档案号" />
-        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
-        <el-table-column label="分组/套餐" width="150">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
-            </div>
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nationId" label="民族">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idNo" label="身份证" width="150" />
-        <el-table-column prop="birthDate" label="出生日期" width="100">
-          <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">
-              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="100" />
-        <el-table-column prop="mobileTelephone" label="手机" width="100" />
-        <el-table-column prop="telephone" label="电话" width="100" />
-        <el-table-column prop="address" label="地址" width="300" />
-        <el-table-column prop="medicalCardNo" label="体检卡号" />
-        <el-table-column prop="jobCardNo" label="工卡号" />
-        <el-table-column prop="maritalStatusId" label="婚姻状况">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="medicalTypeId" label="体检类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="personnelTypeId" label="人员类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="jobPost" label="职务" />
-        <el-table-column prop="jobTitle" label="职称" />
-        <el-table-column prop="salesman" label="介绍人" />
-        <el-table-column prop="isVip" label="是否VIP">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorName" label="登记人" />
-        <el-table-column prop="creationTime" label="登记日期" width="100">
-          <template slot-scope="scope">
-            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isUpload" label="是否上传">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div style="margin-left: 10px">
-        <div class="listBtn">
-          <el-button type="primary" @click="query">查询</el-button>
-        </div>
-        <div class="listBtn">
-          <el-button type="danger" @click="close">关闭</el-button>
-        </div>
-      </div>
-    </div>
-
-  </div>
-</template>
-<script>
-import moment from "moment";
-import { mapState, mapMutations } from "vuex";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
-
-import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
-import Camera from "../../components/patientRegister/Camera.vue";
-
-export default {
-  components: {
-    PatientRegisterEdit,
-    Camera,
-  },
-  props: ['win'],
-  data() {
-    return {
-      dataList: [], //列表数据
-      multipleSelection: [], //选中的数据列表
-      dialogVisible: false,
-      dialogCamera: false,
-
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-    };
-  },
-
-  created() { },
-
-  //挂载完成
-  mounted() { },
-  computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
-  },
-  methods: {
-    ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
-
-
-    //点击体检次数行
-    rowick(row) {
-      this.doctorCheckPrBaseInit()
-      this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo
-      objCopy(row, this.doctorCheck.prBase)        //基本信息
-
-      this.sumPREditInit()
-      objCopy(row, this.dataTransOpts.tableS.patient_register)  //总检信息
-    },
-
-    ldddw(arrayData, key, value, display) {
-      return dddw(arrayData, key, value, display);
-    },
-
-    lmoment(date, forMat) {
-      return moment(new Date(date)).format(forMat);
-    },
-
-    //查询
-    query() {
-      let body = {}
-
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
-
-      if (this.patientRegister.query.customerOrgFlag) {
-        if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId[0]
-      }
-
-      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.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
-
-      //StartDate EndDate
-      if (this.patientRegister.query.dateRange) {
-        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
-        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
-      }
-
-
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
-
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
-
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
-
-
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
-        .then((res) => {
-          this.dataList = res.data;
-        });
-    },
-
-
-    //关闭
-    close() {
-      //console.log('this.win',this.win)
-      if (this.win == 'doctorCheck') {
-        this.doctorCheck.doctorCheckDialogVisible = false
-      } else {
-        this.sumDoctorCheck.sumDoctorCheckDialogVisible = false
-      }
-
-    },
-
-  },
-
-  //监听事件
-  watch: {
-
-  },
-};
-</script>
-<style scoped>
-.box {
-  display: flex;
-}
-
-.query {
-  margin-left: 5px;
-  margin-bottom: 2px;
-}
-
-.listBtn {
-  margin-top: 10px;
-}
-</style>
diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue
index f901917..f797974 100644
--- a/src/components/patientRegister/PatientLis.vue
+++ b/src/components/patientRegister/PatientLis.vue
@@ -4,9 +4,9 @@
     <div style="display: flex">
       <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'" @contextmenu.prevent="onContextmenu">
         <div>
-          <el-table @body-scrolling="load" :data="tableData" border
-            :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 250) * 2) / 3)"
-            highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" size="small" row-key="id"
+          <el-table @body-scrolling="load" :data="tableData" border highlight-current-row
+           :height="window.pageHeight < 600 ? 238:Math.floor((window.pageHeight - 243)*2/3)"
+            @row-click="rowClick" @row-dblclick="rowDblclick" size="small" row-key="id"
             @selection-change="handleSelectionChange" ref="info" id="info" :row-class-name="handleRowClassName">
             <!-- 取消勾选，改为选中
           <el-table-column type="selection" width="40" show-overflow-tooltip/>
@@ -109,8 +109,8 @@
         <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
           <!-- 给合项目 -->
           <el-tab-pane label="预览" name="1">
-            <div style="overflow: scroll; width: 100%;height: 240px;">
-              <el-image  :src="lisLabel">
+            <div :style="`overflow: scroll; width: 100%;height: ${window.pageHeight < 600 ? 119:Math.floor((window.pageHeight - 243)/3)}px;`">
+              <el-image :src="lisLabel">
                 <div slot="placeholder" class="image-slot">
                   加载中<span class="dot">...</span>
                 </div>
@@ -261,7 +261,7 @@ export default {
       oneClick: 0,  // 1 表示行单击一次
       DbClick: 0,  // 1 表示行有单击第二次
 
-      lisLabel:'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
+      lisLabel: 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
     };
   },
 
@@ -295,9 +295,17 @@ export default {
       "customerOrg",
     ]),
 
+    // 照片显示
     peoplePhoto() {
       return photoParse(this.tableDataCurrentRow.photo)
+    },
+
+    // 表体高度
+    tableHeight() {
+      let fixHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
+      return Math.floor((fixHeight - 243) * 2 / 3)
     }
+
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@@ -524,7 +532,7 @@ export default {
           "yyyy-MM-DD"
         );
         if (body.startDate > body.endDate) {
-          this.$message.warning({ showClose: true, message: "起始日期不能大于截止日期，数据校验不通过！"});
+          this.$message.warning({ showClose: true, message: "起始日期不能大于截止日期，数据校验不通过！" });
           return;
         }
       }
@@ -544,8 +552,8 @@ export default {
         };
 
       console.log("/api/app/LisRequest/GetListInFilter", body);
-
-      postapi("/api/app/LisRequest/GetListInFilter", body)
+      // /api/app/patientregister/getlistinfilter
+      postapi("/api/app/patientregister/getlistinfilter", body)
         .then(res => {
           if (res.code != -1) {
             // 刷新最大记录数
@@ -622,7 +630,7 @@ export default {
       let isPrintLisRequest = false;
       let res = null;
       if (prId.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
+        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
         return;
       }
 
@@ -668,7 +676,7 @@ export default {
     //检验条码打印
     lisPrint(prId, ReportCode, isPreview) {
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
         return;
       }
 
@@ -677,8 +685,8 @@ export default {
       let toOutShell = {
         ReportCode,
         token,
-        isBuildImage:'N',
-        IsUploadPdf:'N',
+        isBuildImage: 'N',
+        IsUploadPdf: 'N',
         preViewCanPrint: "N",
         Parameters: [
           { Name: "printer", Value: user },
@@ -785,8 +793,8 @@ export default {
       let toOutShell = {
         ReportCode,
         token,
-        isBuildImage:'N',
-        IsUploadPdf:'N',
+        isBuildImage: 'N',
+        IsUploadPdf: 'N',
         preViewCanPrint: "Y",
         Parameters: [
           { Name: "printer", Value: user },
diff --git a/src/components/patientRegister/PatientRegisterEditBak240401.vue b/src/components/patientRegister/PatientRegisterEditBak240401.vue
deleted file mode 100644
index 1d38716..0000000
--- a/src/components/patientRegister/PatientRegisterEditBak240401.vue
+++ /dev/null
@@ -1,1791 +0,0 @@
-<template>
-  <div>
-    <!--组件主体-->
-    <div style="display: flex">
-      <div :style="'width:' + (window.pageWidth - 110 - 20) + 'px;'">
-        <!--查询条件-->
-        <div v-show="checkPagePriv(pagePriv.privs, '查找')" style="position: absolute;top:28px;left:180px;">
-          <PatientRegisterEditQuery />
-        </div>
-        <div>
-          <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="单位名称" prop="customerOrgId">
-                  <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" filterable
-                    popper-class="example"
-                    :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
-                    :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true : false" size="small">
-                  </el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="条码号" prop="patientRegisterNo">
-                  <el-input v-model="form.patientRegisterNo" disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="档案号" prop="patientNo">
-                  <el-input v-model="form.patientNo" disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="体检次数" prop="medicalTimes">
-                  <el-input v-model="form.medicalTimes" disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="性别" prop="sexId" label-width="50px">
-                  <el-select v-model="form.sexId" placeholder="请选择" size="small" filterable
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'">
-                    <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="姓名" prop="patientName">
-                  <el-input id="patientName" v-model="form.patientName" @change="Query(form.patientName)" size="small"
-                    autocomplete="off"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="身份证号" prop="idNo">
-                  <el-input v-model="form.idNo" @change="changeIdNo" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="出生日期" prop="birthDate">
-                  <!-- 
-                  <input type="date" v-model="form.birthDate" size="small" 
-                    :style="'border-radius: 4px;border: 1px solid #DCDFE6;height: 32px;line-height: 32px;padding-left: 2px;width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'"/>
-                  -->
-                  <el-date-picker v-model="form.birthDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                    placeholder="出生日期" :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'"
-                    @change="changeBirthDate" prefix-icon="" size="small" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="年龄" prop="age">
-                  <el-input v-model="form.age" size="small" @change="changeAge"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="婚姻" prop="maritalStatusId" label-width="50px">
-                  <el-select v-model="form.maritalStatusId" placeholder="请选择" size="small" filterable
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'">
-                    <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3" />
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="手机号" prop="mobileTelephone">
-                  <el-input v-model="form.mobileTelephone" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="电话" prop="telephone">
-                  <el-input v-model="form.telephone" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="邮箱" prop="email">
-                  <el-input v-model="form.email" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="邮编" prop="postalCode">
-                  <el-input v-model="form.postalCode" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="籍贯" prop="birthPlaceId" label-width="50px">
-                  <el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3" />
-            </el-row>
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="地址" prop="address">
-                  <el-input v-model="form.address" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="人员类别" prop="personnelTypeId">
-                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small"
-                    :disabled="isComplete">
-                    <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="民族" prop="nationId" label-width="50px">
-                  <el-select v-model="form.nationId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3" />
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="工卡号" prop="jobCardNo">
-                  <el-input v-model="form.jobCardNo" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="体检卡号" prop="medicalCardNo">
-                  <el-input v-model="form.medicalCardNo" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="职务" prop="jobPost">
-                  <el-input v-model="form.jobPost" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="职称" prop="jobTitle" label-width="50px">
-                  <el-input v-model="form.jobTitle" size="small"
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="介绍人" prop="salesman">
-                  <el-input v-model="form.salesman" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="体检中心" prop="medicalCenterId">
-                  <el-select v-model="form.medicalCenterId" placeholder="请选择" filterable
-                    :disabled="peisid ? true : false" size="small"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'">
-                    <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="单位体检次数" prop="isVip" label-width="110px">
-                  <el-select :class="form.customerOrgId == dict.personOrgId ? '' : 'enterToTab'"
-                    v-model="form.customerOrgRegisterId" placeholder="次数" size="small"
-                    :disabled="form.customerOrgId == dict.personOrgId"
-                    :style="'width:' + Math.floor((window.pageWidth - 654) / 4.8) + 'px;'" @change="changeMedicalTimes"
-                    value-key="id">
-                    <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="电话随访" prop="isPhoneFollow">
-                  <!--
-                  <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
-                  <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
-                  -->
-                  <el-checkbox v-model="form.isPhoneFollowBox" @change="changeBox('isPhoneFollow')" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="2">
-                <el-form-item label="VIP" prop="isVip" label-width="50px">
-                  <!--
-                  <el-radio v-model="form.isVip" label="Y">是</el-radio>
-                  <el-radio v-model="form.isVip" label="N">否</el-radio>
-                  -->
-                  <el-checkbox v-model="form.isVipBox" @change="changeBox('isVip')" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="隐藏姓名" prop="isNameHide">
-                  <!--
-                  <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
-                  <el-radio v-model="form.isNameHide" label="N">否</el-radio>
-                  -->
-                  <el-checkbox v-model="form.isNameHideBox" @change="changeBox('isNameHide')" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="锁住" prop="isLock" label-width="50px">
-                  <!--
-                  <el-radio v-model="form.isLock" label="Y">是</el-radio>
-                  <el-radio v-model="form.isLock" label="N">否</el-radio>
-                   -->
-                  <el-checkbox v-model="form.isLockBox" @change="changeBox('isLock')" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="体检开始" prop="isMedicalStart">
-                  <el-select v-model="form.isMedicalStart" placeholder="请选择" disabled size="small">
-                    <el-option label="是" value="Y" />
-                    <el-option label="否" value="N" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="分组" prop="customerOrgGroupId">
-                  <el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
-                    @change="changeCustomerOrgGroupId" :disabled="displayGroup"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
-                    <el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="套餐" prop="medicalPackageId">
-                  <el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
-                    @change="changeMedicalPackageId" :disabled="displayPackage"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11">
-                <el-form-item label="备注" prop="remark">
-                  <el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注" size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <el-form-item label="状态" prop="completeFlag" label-width="50px">
-                  <el-select v-model="form.completeFlag" placeholder="请选择"
-                    :disabled="(form.completeFlag == '2' || form.completeFlag == '3') ? true : false" size="small">
-                    <div v-if="form.completeFlag == '2' || form.completeFlag == '3'">
-                      <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
-                        :value="item.id">
-                      </el-option>
-                    </div>
-                    <div v-else>
-                      <el-option label="预登记" value="0" />
-                      <el-option label="正式登记" value="1" />
-                    </div>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <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
-                    ? moment(form.creationTime).format('yyyy-MM-DD')
-                    : ''
-                    " disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <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 :value="form.lastModificationTime
-                    ? moment(form.lastModificationTime).format('yyyy-MM-DD')
-                    : ''
-                    " disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <el-image
-            :style="'position: absolute;top:50px;right:' + (100 + Math.floor((window.pageWidth - 750) / 24)) + 'px; width: 150px; height: 160px;'"
-            :src="peoplePhoto">
-            <div slot="placeholder" class="image-slot">
-              加载中<span class="dot">...</span>
-            </div>
-          </el-image>
-        </div>
-        <!--人员登记组合项目明细 register_check_asbitem-->
-        <div>
-          <PatientRegisterItem :prForm="form" :prAsbOpraOpts="prAsbOpraOpts" :triggerHeadSave="triggerHeadSave"
-            :refreshFormId="refreshFormId" />
-        </div>
-      </div>
-      <div style="margin-left: 10px;">
-        <div v-show="checkPagePriv(pagePriv.privs, '拍照')">
-          <el-button type="primary" class="commonbutton" @click="photoGrah" icon="el-icon-camera">拍照</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '读身份证')" class="btn">
-          <el-button @click="peopleIcCard" class="commonbutton">读身份证</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '复制新增')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="rdCopy">复制新增</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btn">
-          <el-button type="success" class="commonbutton" @click="btnSubmit('form', true)">保存</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '检验单申请')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="lisRequest">检验单申请</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '条码打印')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="lisPrint('0002', false)">条码打印</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '条码补打')" class="btn">
-          <el-button type="danger" class="commonbutton" @click="reLisRequest">条码补打</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '手动合并项目')" class="btn">
-          <el-button type="danger" class="commonbutton" @click="reMergeAsbitem">手动合并项目</el-button>
-        </div>
-
-        <div v-show="checkPagePriv(pagePriv.privs, '全个人支付')" style="margin-top: 30px;">
-          <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '0'">全个人支付</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '全单位支付')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '1'">全单位支付</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '全赠送')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '2'">全赠送</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
-          <el-button type="success" class="commonbutton" @click="toCharge(form.patientRegisterNo)">收费</el-button>
-        </div>
-      </div>
-    </div>
-
-    <!--组件弹窗-->
-    <div>
-      <!-- 人员档案列表 -->
-      <el-dialog title="人员档案列表" :visible.sync="dialogVisible" width="800px" :show-close="false"
-        :close-on-click-modal="false" :append-to-body="true">
-        <el-table :data="patientList" border width="800" height="480" row-key="id" size="small"
-          class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" @row-dblclick="patientDblclick"
-          ref="patientList">
-          <el-table-column type="index" width="30" />
-          <el-table-column prop="patientNo" label="档案号" />
-          <el-table-column prop="lastTime" label="末次体检" width="100">
-            <template slot-scope="scope">
-              <div v-if="scope.row.lastTime">
-                {{ moment(scope.row.lastTime).format("yyyy-MM-DD") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="medicalTimes" label="体检次数" />
-          <el-table-column prop="displayName" label="姓名" />
-          <el-table-column prop="sexId" label="性别">
-            <template slot-scope="scope">
-              <div>
-                {{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="maritalStatusId" label="婚姻">
-            <template slot-scope="scope">
-              <div>
-                {{ dddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="birthDate" label="出生日期" width="100">
-            <template slot-scope="scope">
-              <div v-if="scope.row.birthDate">
-                {{ moment(scope.row.birthDate).format("yyyy-MM-DD") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="nationId" label="民族">
-            <template slot-scope="scope">
-              <div>
-                {{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="idNo" label="身份证号" />
-          <el-table-column prop="telephone" label="电话" />
-          <el-table-column prop="mobileTelephone" label="手机号" />
-        </el-table>
-        <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" @click="dialogVisible = false" style="width:90px;">取消</el-button>
-          <el-button class="commonbutton" type="primary" @click="choosePatient" style="width:90px;">确定</el-button>
-        </span>
-      </el-dialog>
-
-      <!-- 拍照（openCamera） 网页模式，已废弃  
-    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600"
-      :close-on-click-modal="false" :append-to-body="true">
-      <Camera :id="form.id" />    
-    </el-dialog>
-    -->
-      <!-- 检验条码补打 -->
-      <el-dialog title="检验条码补打" :visible.sync="patientRegister.lisRequestVisble" width="600px" height="400"
-        :show-close="false" :close-on-click-modal="false" :append-to-body="true">
-        <LisRequest :id="form.id" :brushTimes="brushTimes" />
-      </el-dialog>
-
-      <!-- 手动合并项目 -->
-      <el-dialog title="手动合并项目" :visible.sync="patientRegister.mergeAsbitemVisble" width="600px" height="400"
-        :show-close="false" :close-on-click-modal="false" :append-to-body="true">
-        <MergeAsbitem :id="form.id" :medicalCenterId="form.medicalCenterId" :brushTimes="brushTimes" />
-      </el-dialog>
-
-      <!-- 收费 -->
-      <el-dialog title="" :visible.sync="dialogWin.charge" :close-on-click-modal="false" :append-to-body="true" fullscreen
-        @close="closeDialogCharge">
-        <div style="margin-top: -30px;">
-          <Charge :patientRegisterNo="chargePatientRegisterNo" />
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-<script>
-import moment from "moment";
-import { mapState, mapActions } from "vuex";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import {
-  getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
-  birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
-  photoParse, savePeoplePhoto, arrayExistObj
-} from "../../utlis/proFunc";
-import Camera from "./Camera.vue";
-import PatientRegisterItem from "./PatientRegisterItem.vue";
-import LisRequest from "./LisRequest.vue";
-import MergeAsbitem from "./MergeAsbitem.vue";
-import Charge from "../../views/charge/charge.vue";
-import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue";
-import proApi from "../../utlis/proApi";
-
-export default {
-  components: {
-    Camera,
-    LisRequest,
-    MergeAsbitem,
-    PatientRegisterItem,
-    Charge,
-    PatientRegisterEditQuery
-  },
-  // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' 
-  props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
-  data() {
-    return {
-      pagePriv: {
-        routeUrlorPageName: 'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
-        privs: [] // 页面权限
-      },
-
-
-      brushTimes: 0,
-
-      peisid: null,
-      peoplePhoto: '',
-
-      form: {
-        registerManType: 'customer', //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员
-        id: "", //id
-        photo: '', //照片
-        patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
-        patientNo: "", //档案号
-        customerOrgId: ["00000000-0000-0000-0000-000000000000"], //单位编号 默认个人 
-        customerOrgGroupId: null, //分组
-        medicalPackageId: null, //套餐
-        patientName: "", //姓名
-        birthDate: null, //日期型
-        sexId: "U", //性别 默认未知U
-        age: null, //年龄
-        jobCardNo: "", //工卡号
-        medicalCardNo: "", //体检卡号
-        maritalStatusId: "9", //婚姻状况 默认未知
-        medicalTypeId: null, //体检类别
-        personnelTypeId: null, //人员类别
-        jobPost: "", //职务
-        jobTitle: "", //职称
-        salesman: "", //介绍人
-        sexHormoneTermId: null, //性激素期限
-        isNameHide: "N", //隐藏姓名
-        isPhoneFollow: "N", //电话随访
-        isVip: "N", //vip客户
-        remark: "", //
-        isLock: "N", //是否锁住
-        completeFlag: "1", //完成标志 0:预登记，1：未检，2：部份已检，3：已总检  【创建编辑时不操作】
-        isMedicalStart: "N", //体检开始标志 【创建编辑时不操作】
-        patientRegisterNo: "", //条码号 【创建编辑时不操作】
-        medicalTimes: 1, //条码号 【创建编辑时不操作】
-        medicalCenterId: null, //体检中心
-        address: "", //地址
-        email: "", //email
-        idNo: "", //身份证号
-        telephone: "", //电话
-        mobileTelephone: "", //手机号
-        nationId: null, //民族编号
-        birthPlaceId: null, //籍惯（出生地）
-        postalCode: "", //邮编
-        creatorId: null,
-        creationTime: "",
-        lastModificationTime: "",
-        lastModifierId: null,
-        isVipBox: false, //vip客户
-        isNameHideBox: false, //隐藏姓名
-        isPhoneFollowBox: false, //电话随访
-        isLockBox: false, //是否锁住
-        customerOrgRegisterId: null,
-        isMaxMedicalTimes: 'N',
-        medicalStartDate: null
-      }, //单位 记录 目前新增与更新是一致
-      formInit: {}, //表单初始化
-      customerOrgRegisterList: [], //单位体检次数列表
-      defaultNull: [
-        "customerOrgId",
-        "customerOrgGroupId",
-        "medicalPackageId",
-        "birthDate",
-        "age",
-        "maritalStatusId",
-        "medicalTypeId",
-        "personnelTypeId",
-        "sexHormoneTermId",
-        "medicalCenterId",
-        "nationId",
-        "birthPlaceId",
-      ], //一般uuid字段为空时，需设置为null值
-
-      rules: {
-        customerOrgId: [
-          { required: true, message: "请填写单位", trigger: "blur" },
-        ],
-        patientName: [
-          { required: true, message: "请填写姓名", trigger: "blur" },
-        ],
-        medicalCenterId: [
-          { required: true, message: "请填写体检中心", trigger: "blur" },
-        ],
-      },
-
-      dialogVisible: false,
-      patientList: [], //人员列表（用于判断人员多次体检）
-      patientChoosed: {}, //查重选中的人员
-
-
-      registerVisible: false,
-      patientRegisters: [],
-      registerChoosed: {},
-
-      dialogCamera: false, //拍照组件
-
-      chargePatientRegisterNo: '',  //对哪个条码客户收费 
-
-      //人员登记，组合项目明细操作相关参数
-      prAsbOpraOpts: {
-        formId: '',      //form.id为空时，明细保存取此formId
-        copyNew: 0,      //触发复制新增
-        payTypeFlag: '', //触发调整支付方式
-        prAsbSave: 0, //触发组合项目明细保存
-        prAsbQuery: 0,//触发组合项目明细查询，比如收费后，刷新收费状态
-        prAsbGroup: 0, //触发分组更换
-        prAsbPackage: 0, //触发套餐更换
-      },
-    };
-  },
-
-  created() {
-    //获取用户当前页面的权限
-    let userPriv = window.sessionStorage.getItem('userPriv')
-    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-
-    this.formInit = deepCopy(this.form)
-    // 初始化字典数据
-    this.dictInit()
-  },
-
-  //挂载完成
-  mounted() {
-    // 表单中 回车 代替 tab
-    this.enterToTab();
-  },
-
-  computed: {
-    ...mapState(["window", "dialogWin", "dataTransOpts", "dict", "patientRegister", "customerOrg", "projPriv"]),
-
-    //是否总检(已总检则不允许修改套餐与分组)
-    isComplete() {
-      return this.form.completeFlag == '3' ? true : false;
-    },
-
-    // 套餐 disabled 如完成体检亦不允许编辑
-    displayPackage() {
-      let isPersonOrgId = true
-      if (!this.isComplete) {
-        if (!this.form.customerOrgId) return false
-        if (typeof this.form.customerOrgId == 'string') {
-          if (this.form.customerOrgId == this.dict.personOrgId) isPersonOrgId = false
-        } else {
-          if (this.form.customerOrgId[this.form.customerOrgId.length - 1] == this.dict.personOrgId) isPersonOrgId = false
-        }
-      }
-      return isPersonOrgId
-    },
-
-    // 分组 disabled 如完成体检亦不允许编辑
-    displayGroup() {
-      let isPersonOrgId = true
-      if (!this.isComplete) {
-        if (!this.form.customerOrgId) return isPersonOrgId
-        if (typeof this.form.customerOrgId == 'string') {
-          if (this.form.customerOrgId != this.dict.personOrgId) isPersonOrgId = false
-        } else {
-          if (this.form.customerOrgId[this.form.customerOrgId.length - 1] != this.dict.personOrgId) isPersonOrgId = false
-        }
-      }
-      return isPersonOrgId
-    },
-  },
-  methods: {
-    ...mapActions(['getPatientRegisterAbs']),
-    dddw, moment, checkPagePriv,
-
-    //数据初始化
-    dictInit() {
-      //性别（仅档案用）
-      getapi("/api/app/sex").then((res) => {
-        if (res.code == 1) {
-          this.dict.sex = res.data;
-        }
-      });
-
-      //适用性别
-      getapi("/api/app/for-sex").then((res) => {
-        if (res.code == 1) {
-          this.dict.forSex = res.data;
-        }
-      });
-
-      //体检中心
-      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
-        (res) => {
-          if (res.code == 1) {
-            this.dict.organization = res.data;
-          }
-        }
-      );
-
-      //体检单位
-      getapi("/api/app/customer-org/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.customerOrg = res.data;
-        }
-      });
-
-      //体检类别
-      getapi("/api/app/medical-type/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.medicalType = res.data;
-        }
-      });
-
-      //人员类别
-      getapi("/api/app/personnel-type/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.personnelType = res.data;
-        }
-      });
-
-      //婚姻状况
-      getapi("/api/app/MaritalStatus/GetMaritalStatusList").then((res) => {
-        if (res.code == 1) {
-          this.dict.maritalStatus = res.data;
-        }
-      });
-
-      //性激素期
-      getapi("/api/app/sex-hormone-term/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.sexHormoneTerm = res.data;
-        }
-      });
-
-      //民族
-      getapi("/api/app/nation/in-filter").then((res) => {
-        if (res.code != -1) {
-          this.dict.nation = res.data;
-        }
-      });
-
-      //籍惯 ，出生地
-      getapi("/api/app/birth-place/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.birthPlace = res.data;
-        }
-      });
-
-      //套餐
-      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
-        if (res.code == 1) {
-          this.dict.medicalPackage = res.data;
-        }
-      });
-
-      //支付方式
-      getapi("/api/app/pay-mode").then((res) => {
-        if (res.code == 1) {
-          this.dict.payMode = res.data;
-        }
-      });
-
-      //项目类别 树结构
-      // getapi("/api/app/item-type/by-code-all").then((res) => {
-      //   if (res.code != -1) {
-      //     this.dict.itemTypeTree = res.data;
-      //     tcdate(this.dict.itemTypeTree);
-      //   }
-      // });
-
-      // postapi("/api/app/asbitem/GetBasicList",{isFilterActive:'Y'}).then((res) => {
-      //   if (res.code != -1) {
-      //     this.dict.asbItemAll = res.data;
-      //   }
-      // });
-
-      // console.log("dict", this.dict);
-    },
-
-
-    // 获取登记信息 初始form表单数据
-    async initFormData(patientRegisterId) {
-
-      this.peisid = window.sessionStorage.getItem('peisid');
-
-      if (!patientRegisterId) { //添加
-        objCopy(this.formInit, this.form);
-        this.form.medicalCenterId = this.peisid; //体检中收
-        this.form.customerOrgId = this.patientRegister.query.customerOrgId || this.dict.personOrgId //体检单位
-        this.form.customerOrgParentId = await this.getParentCustomerOrgId(this.form.customerOrgId) //体检父单位
-
-      } else {
-        // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
-        let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`)
-        this.form = res.data
-      }
-      this.initBox();
-      this.getPeoplePhoto(this.form.photo)
-
-      // 单位/个人 的分组与套餐处理
-      await this.changeCustomerOrgId(this.form.customerOrgId)
-      this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新  
-
-
-    },
-
-    //选择单位
-    async changeCustomerOrgId(v) {
-      let customerOrgId = ""
-      if (Array.isArray(v) && v.length > 0) {
-        customerOrgId = v[v.length - 1]
-      } else {
-        customerOrgId = v
-      }
-      let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
-
-      if (customerOrgParentId) {
-        if (customerOrgParentId != this.dict.personOrgId) this.getCustomerOrgRegisterList(customerOrgParentId)
-
-        // 父单位被更改时，需要触发 修改 分组/套餐
-        if (this.form.customerOrgParentId != customerOrgParentId) {
-          if (customerOrgParentId == this.dict.personOrgId) {
-            this.form.customerOrgRegisterId = null
-            this.form.customerOrgGroupId = null
-            this.form.medicalPackageId = null
-            this.patientRegister.customerOrgGroup = []
-          } else {
-            this.form.customerOrgRegisterId = null
-            this.form.customerOrgGroupId = null
-            this.form.medicalPackageId = null
-            //获取单位体检次数
-            // this.getCustomerOrgRegisterList(customerOrgParentId)
-          }
-
-          if (this.form.customerOrgParentId == this.dict.personOrgId) {
-            this.changeMedicalPackageId()
-          } else {
-            this.changeCustomerOrgGroupId()
-          }
-          this.form.customerOrgParentId = customerOrgParentId
-        }
-      }
-    },
-
-    // 获取顶级单位ID
-    async getParentCustomerOrgId(customerOrgId) {
-      let customerOrgParentId = null
-      if (!customerOrgId) return customerOrgParentId
-      if (typeof customerOrgId == 'string') {
-        try {
-          let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`)
-          if (res.code != -1) customerOrgParentId = res.data
-        } catch (error) {
-          console.log('获取顶级单位ID出错：', error)
-        }
-      } else if (customerOrgId.length > 0) {
-        customerOrgParentId = customerOrgId[0]
-      }
-      return customerOrgParentId
-    },
-
-    //获取单位体检次数
-    getCustomerOrgRegisterList(customerOrgParentId) {
-      //获取单位体检次数信息
-      getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgParentId}`)
-        .then(res => {
-          if (res.code != - 1) {
-            console.log('获取单位体检次数', this.form.customerOrgRegisterId, res.data)
-            if (this.form.customerOrgRegisterId) {
-              let lfind = arrayExistObj(res.data, "id", this.form.customerOrgRegisterId)
-              if (lfind == -1) this.form.customerOrgRegisterId = ''
-            }
-            if (!this.form.customerOrgRegisterId) {
-              this.customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
-              if (this.customerOrgRegisterList.length > 0) {
-                this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
-              }
-            }
-            if (this.form.customerOrgRegisterId) return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
-          }
-        }).then(res => {
-          if (res && res.code != -1) {
-            this.patientRegister.customerOrgGroup = res.data;
-          }
-        })
-    },
-
-    //读取身份证信息
-    peopleIcCard() {
-      if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
-        return
-      }
-      this.$peisAPI.peopleIcCard().then(res => {
-        console.log('peopleIcCard', res)
-        let lres = JSON.parse(res)
-        if (lres.code >= 0) {
-          let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
-          this.form.patientName = idNos.Name
-          this.form.birthDate = idNos.birthDate
-          this.form.sexId = idNos.sexId
-          this.form.age = idNos.age
-          this.form.nationId = idNos.nationId
-          this.form.idNo = idNos.IDCode
-          this.form.address = idNos.Address
-          this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
-        }
-      })
-    },
-
-    //获取单位体检次数列表，并默认赋最后一次体检次数
-    // async getCustomerOrgRegisterList() {
-    //   this.customerOrgRegisterList = []
-    //   if (this.form.customerOrgId == this.dict.personOrgId) {
-    //     this.form.customerOrgRegisterId = null
-    //     return
-    //   }
-    //   try {
-    //     let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
-    //     let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
-    //     this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
-
-    //     //要把已完成体检的次数去掉 (查询时不能触发保存)
-    //     // if (this.customerOrgRegisterList.length > 0) {
-    //     //   this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
-    //     //   //this.changeCustomerOrgGroupId()
-    //     //   this.changeMedicalTimes()
-    //     // }
-
-    //   } catch (error) {
-    //     console.log(error)
-    //   }
-    // },
-
-    //修改单位体检次数
-    changeMedicalTimes() {
-
-      this.form.customerOrgGroupId = null
-      this.changeCustomerOrgGroupId()
-
-      //获取体检次数下的分组
-      this.getCustomerOrgGroup(this.form.customerOrgRegisterId)
-    },
-
-    //移除旧分组或套餐的组合项目
-    removeGroupPackageAsb() {
-      let body = { registerAsbitemIds: [] }
-      let registerAsbitemIds = []
-      let chargeComplete = ''
-
-      //体检基本信息未保存时，删除所有所选项目
-      if (!this.form.id) {
-        this.patientRegister.patientRegisterAbs = [];
-        return body;
-      }
-
-      //删除已选 分组或套餐的组合项目 ，如已收费或 已检时，将 groupPackageId 置为null
-      for (let i = 0; i < this.patientRegister.patientRegisterAbs.length; i++) {
-        if (!this.patientRegister.patientRegisterAbs[i].id) {
-          this.patientRegister.patientRegisterAbs.splice(i, 1)
-          i--
-          continue
-        }
-        if (this.patientRegister.patientRegisterAbs[i].isCharge == 'Y' || this.patientRegister.patientRegisterAbs[i].checkCompleteFlag != '0') {
-          chargeComplete += this.patientRegister.patientRegisterAbs[i].asbitemName + '，'
-          this.patientRegister.patientRegisterAbs[i].groupPackageId = null
-        } else {
-          //数据库有，才添加到待删除的数组中
-          if (this.patientRegister.patientRegisterAbs[i].id) {
-            registerAsbitemIds.push(this.patientRegister.patientRegisterAbs[i].id)
-          }
-          this.patientRegister.patientRegisterAbs.splice(i, 1)
-          i--
-        }
-      }
-
-      if (chargeComplete) {
-        this.$message.info({ showClose: true, message: `所选项目：${chargeComplete}已收费或已检，不可删除！` });
-      }
-
-      body = { registerAsbitemIds };
-
-      return body;
-
-    },
-
-    //添加新套餐/分组的组合项目
-    addGroupPackageAsb(groupPackageAsb, typeFlag, groupPackageId) {
-
-      let payTypeFlag = '0';  //默认个人支付
-      let lfind = -1
-
-
-      if (this.form.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'  //单位支付
-
-      for (let i = 0; i < groupPackageAsb.length; i++) {
-        lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', groupPackageAsb[i].id)
-        if (lfind > - 1) {
-          this.patientRegister.patientRegisterAbs[lfind].groupPackageId = groupPackageId
-          //editCount++
-          continue
-        }
-        let pojo = {
-          asbitemId: groupPackageAsb[i].id,
-          asbitemName: groupPackageAsb[i].displayName,
-          patientRegisterId: this.form.id,
-          standardPrice: groupPackageAsb[i].price,
-          chargePrice: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailPrice : groupPackageAsb[i].price,
-          payTypeFlag,
-          discount: typeFlag == 'group' ? groupPackageAsb[i].discount : 100,
-          isCharge: "N",
-          amount: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailAmount : 1,
-          groupPackageId: groupPackageId
-        }
-        this.patientRegister.patientRegisterAbs.push(pojo)
-      }
-    },
-
-
-
-    //获取体检次数下的分组
-    getCustomerOrgGroup(customerOrgRegisterId) {
-      this.patientRegister.customerOrgGroup = []
-      getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`).then(res => {
-        if (res.code != - 1) {
-          this.patientRegister.customerOrgGroup = res.data;
-        }
-      })
-    },
-
-    //修改出生日期
-    changeBirthDate() {
-      this.form.age = birthdayToAge(this.form.birthDate)
-    },
-
-    //修改出生日期
-    changeAge() {
-      this.form.birthDate = ageToBirthday(this.form.age)
-    },
-
-    //修改身份证，生成年龄、出生、性别
-    changeIdNo() {
-      this.Query(this.form.idNo)
-      let ret = parseID(this.form.idNo)
-      if (ret.age != -1) {
-        this.form.birthDate = new Date(ret.birthday)
-        this.form.age = ret.age
-        this.form.sexId = ret.sex
-      }
-    },
-
-    // //分组改变时触发
-    changeCustomerOrgGroupId() {
-      // this.patientRegister.customerOrgGroupChange++;      
-      // if (this.form.id) this.btnSubmit('form', false);
-      // this.getGroupPackageAsb('group',this.form.customerOrgGroupId)
-      this.prAsbOpraOpts.prAsbGroup++
-
-    },
-
-    // //套餐改变时触发
-    changeMedicalPackageId() {
-      // this.patientRegister.medicalPackageChange++;
-      // if (this.form.id) this.btnSubmit('form', false);
-      // this.getGroupPackageAsb('package',this.form.medicalPackageId)
-      this.prAsbOpraOpts.prAsbPackage++
-    },
-
-    //根据姓名，身份证号 查询档案信息，用于判断人员多次体检
-    Query(param) {
-      //编辑的时候不查重
-      if (this.form.id || !param) return;
-
-      //console.log(`/api/app/patient/in-filter?Filter=${param}`)
-      let body = {
-        filter: param,
-        maxResultCount: 500
-      }
-
-      postapi('/api/app/patient/getlistinfilter', body).then((res) => {
-        if (res.code != -1) {
-          console.log("查重 ", res); //有数据才显示
-          if (res.data && res.data.length > 0) {
-            this.patientList = res.data;
-            this.dialogVisible = true;
-          }
-        }
-      });
-
-    },
-
-    //列表选中
-    rowick(row) {
-      this.patientChoosed = row;
-    },
-
-    patientDblclick(row) {
-      this.patientChoosed = row;
-      this.choosePatient()
-    },
-
-    //确定选择人员
-    choosePatient() {
-      if (!this.patientChoosed) {
-        alert("请选中人员档案信息");
-        return;
-      }
-
-      this.dialogVisible = false;
-
-      this.form.patientId = this.patientChoosed.id;
-      this.form.patientName = this.patientChoosed.displayName;
-      this.form.sexId = this.patientChoosed.sexId;
-      this.form.maritalStatusId = this.patientChoosed.maritalStatusId;
-      this.form.birthDate = new Date(this.patientChoosed.birthDate);
-      this.form.nationId = this.patientChoosed.nationId;
-      this.form.idNo = this.patientChoosed.idNo;
-      this.form.telephone = this.patientChoosed.telephone;
-      this.form.mobileTelephone = this.patientChoosed.mobileTelephone;
-      this.form.patientNo = this.patientChoosed.patientNo;
-      this.form.medicalTimes = this.patientChoosed.medicalTimes + 1;
-
-      if (this.form.birthDate) {
-        this.form.age = birthdayToAge(this.form.birthDate)
-      }
-
-      if (this.form.idNo) {
-        let ret = parseID(this.form.idNo)
-
-        if (!this.form.birthDate) this.form.birthDate = new Date(ret.birthday)
-        if (!this.form.age) this.form.age = ret.age
-        if (!this.form.sexId) this.form.age = ret.sex
-      }
-
-    },
-
-    registerRowClick(row) {
-      this.registerChoosed = row;
-    },
-    registerRowDblclick(row) {
-      this.registerChoosed = row;
-      this.chooseRegister()
-    },
-
-    chooseRegister() {
-      if (!this.registerChoosed) {
-        alert("请选中人员登记信息");
-        return;
-      }
-
-      objCopy(this.registerChoosed, this.form)
-      // this.patientRegister.patientRegisterId = this.registerChoosed.id
-      // this.patientRegister.photo = this.registerChoosed.photo
-      // this.getPatientRegisterAbs(this.registerChoosed.id)
-      this.dataTransOpts.tableS.patient_register.id = this.registerChoosed.id
-      setTimeout(() => {
-        this.dataTransOpts.refresh.register_check_asbitem.M++
-      }, 20);
-
-      this.registerVisible = false
-
-    },
-
-    changeBox(type) {
-      //赋值
-      if (this.form[type + 'Box']) {
-        this.form[type] = 'Y';
-      } else {
-        this.form[type] = 'N';
-      }
-    },
-
-    initBox() {
-      if (this.form.isVip == 'Y') {
-        this.form.isVipBox = true;
-      } else {
-        this.form.isVipBox = false;
-      }
-
-      if (this.form.isNameHide == 'Y') {
-        this.form.isNameHideBox = true;
-      } else {
-        this.form.isNameHideBox = false;
-      }
-
-      if (this.form.isPhoneFollow == 'Y') {
-        this.form.isPhoneFollowBox = true;
-      } else {
-        this.form.isPhoneFollowBox = false;
-      }
-
-      if (this.form.isLock == 'Y') {
-        this.form.isLockBox = true;
-      } else {
-        this.form.isLockBox = false;
-      }
-
-      if (!this.form.id) {
-        this.form.medicalCenterId = this.peisid;
-      }
-    },
-
-    // 组装基本信息保存的参数体
-    madePrBody() {
-      //赋值
-      let body = deepCopy(this.form);
-      // console.log('this.form',this.form)
-      // console.log('body',body)
-      if (this.form.birthDate) {
-        try {
-          body.birthDate = moment(body.birthDate).format("yyyy-MM-DD")
-        } catch (error) {
-          // this.form.birthDate != "Invalid date"
-          body.birthDate = null
-        }
-      } else {
-        body.birthDate = null
-      }
-      if (body.birthDate == "Invalid date") body.birthDate = null
-      if (isNaN(body.age)) body.age = null
-      // console.log('body',body)
-      // Invalid date
-
-      delete body.registerManType;
-      delete body.id;
-      delete body.patientRegisterNo;
-      delete body.medicalTimes;
-      // delete body.completeFlag;
-      delete body.isMedicalStart;
-      delete body.patientNo;
-      delete body.creatorId;
-      delete body.creationTime;
-      delete body.lastModificationTime;
-      delete body.lastModifierId;
-      delete body.isVipBox;
-      delete body.isNameHideBox;
-      delete body.isPhoneFollowBox;
-      delete body.isLockBox;
-      delete body.photo;
-
-      // if(this.form.registerManType == 'customer') delete body.medicalStartDate;
-      if (this.form.id) delete body.medicalStartDate;
-
-      setNull(body, this.defaultNull);
-
-      if (typeof this.form.customerOrgId == 'object') {
-        if (this.form.customerOrgId.length > 0) body.customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
-      }
-
-      //日期转换 日期控件增加格式
-      // console.log("body.birthDate", body.birthDate);
-      // if (body.birthDate) {
-      //   body.birthDate = moment(new Date(body.birthDate)).format(
-      //     "yyyy-MM-DD"
-      //   );
-      // }
-      return body
-    },
-
-    //提交
-    btnSubmit(formName, msgTip) {
-      this.$refs[formName].validate((valid, fields) => {
-        console.log('fields', fields)
-        if (!valid) {
-          this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message});
-          return false
-        }
-
-        if (this.form.customerOrgId != this.dict.personOrgId) {
-          if (!this.form.customerOrgRegisterId) {
-            this.$message.warning({ showClose: true, message: "请填写单位体检次数！"});
-            return false
-          }
-        }
-
-        if (this.form.idNo && checkIDCode(this.form.idNo) == false) {
-          this.$message.warning({ showClose: true, message: "身份证号填写不合法！"});
-          return false
-        }
-
-
-
-        if (this.form.id) {
-          // 更新时，先保存明细，再更新主表
-          this.prAsbOpraOpts.prAsbSave++  //触发组合项目保存
-        } else {
-          let body = this.madePrBody()
-          //id为空则新增
-          console.log(`/api/patientregister/createreturninfo`, body);
-          postapi(`/api/patientregister/createreturninfo`, body).then(
-            (res) => {
-              if (res.code == 1) {
-                //console.log('res',res)
-                if (msgTip) console.log("操作成功");
-
-                //触发已选组合项目保存
-                this.prAsbOpraOpts.formId = res.data.id
-                this.dataTransOpts.tableS.patient_register.id = res.data.id
-                let temp = Object.assign({}, res.data, { id: '' })
-                objCopy(temp, this.form)
-
-                // 稍作延时，否则 this.prAsbOpraOpts.formId 尚未更新
-                setTimeout(() => {
-                  this.prAsbOpraOpts.prAsbSave++
-                }, 20)
-
-                // 用于刷新登记的列表
-                this.refreshRegister(Object.assign({}, res.data))
-
-                //一般读身份证照片时，会出现这种情况
-                if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
-              }
-            }
-          );
-        }
-
-      });
-    },
-
-    //将现有的数据，复制并展现，但未保存
-    rdCopy() {
-      if (!this.form.id) {
-        this.$message.info({ showClose: true, message: "该信息尚未保存，不可执行此操作！"});
-        return;
-      }
-
-      this.patientRegister.photo = '/pic/Photo.jpg'
-      this.patientRegister.patientRegisterId = '';
-      this.form.id = '';
-      this.form.patientId = '00000000-0000-0000-0000-000000000000';
-      this.form.patientRegisterNo = '';
-      this.form.patientNo = '';
-      this.form.medicalTimes = 1;
-      this.form.patientName = '';
-      this.form.photo = '';
-
-      // this.patientRegister.patientRegisterAbs.forEach(e => {
-      //   e.id = '';
-      //   e.patientRegisterId = '';
-      //   e.isCharge = 'N';
-      //   e.checkCompleteFlag = '0'
-      //   e.isLock = 'N'
-      // });
-      // 触发明细项目复制
-      setTimeout(() => {
-        this.prAsbOpraOpts.copyNew++
-      }, 20);
-
-      // console.log('this.patientRegister.patientRegisterAbs',this.patientRegister.patientRegisterAbs)
-      this.$message.info({ showClose: true, message: "操作成功，请记得点保存"});
-      this
-
-    },
-
-    //删除
-    del() {
-      deletapi(
-        `/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`
-      ).then((res) => {
-        console.log("删除 操作成功");
-        this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
-        this.getCustomerOrgTree();
-      });
-    },
-
-    //拍照（已废弃）
-    // openCamera() {
-    //   if (!this.form.id) {
-    //     alert("请先保存人员信息");
-    //     return;
-    //   }
-    //   this.patientRegister.cameraVisble = true;
-    // },
-
-    //拍照（调壳程序）
-    photoGrah() {
-      if (!this.form.id) {
-        alert("请先保存人员信息");
-        return;
-      }
-      if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
-        return
-      }
-      this.$peisAPI.photoGrah()
-        .then(res => {
-          console.log(res)
-          //alert(res)
-          let lres = JSON.parse(res)
-          if (lres.code && lres.code.toLowerCase() == 'success') {
-            let uploadPhoto = {
-              patientRegisterId: this.form.id,
-              photo: lres.Photo,
-            };
-            this.patientRegister.photo = `data:image/${lres.PhotoFormat};base64,${lres.Photo}`
-            return postapi(`/api/app/patient-register/up-load-img`, uploadPhoto)
-          } else {
-            this.$message.error({ showClose: true, message: "上传照片错误" + lres.code})
-          }
-        }).then(res => {
-          if (res.code == 1) {
-            let body = {
-              patientRegisterId: this.form.id,
-              photo: res.data,
-            };
-            console.log(body);
-            return postapi(`/api/app/patient-register/update-photo`, body);
-          }
-        }).then(res => {
-          if (res.code != -1) {
-            //console.log('拍照',res.data)
-            this.patientRegister.patientRegisterRd.photo = res.data.photo
-            console.log("操作成功");
-          }
-        }).catch(err => {
-          console.log('this.$peisAPI.photoGrah', err)
-        })
-    },
-
-    getPeoplePhoto(photo) {
-      this.peoplePhoto = photoParse(photo)
-    },
-
-    // 打印指引单(isPreview)
-    async guidePrint(ReportCode, isPreview) {
-      if (this.form.id.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
-        return;
-      }
-      if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
-        return
-      }
-
-      let token = window.sessionStorage.getItem('token');
-      let user = window.sessionStorage.getItem('user');
-      let toOutShell = {
-        ReportCode, token,
-        isBuildImage:'N',
-        IsUploadPdf:'N',
-        preViewCanPrint: 'N',
-        Parameters: [
-          { Name: 'printer', Value: user },
-          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
-        ],
-      };
-
-
-      if (isPreview) {
-        //
-        //this.multipleSelection.forEach((item,index) =>{
-        postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
-            }
-          })
-          .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
-          });
-        // });
-      } else {
-
-        postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.print(JSON.stringify(toOutShell));
-            }
-          })
-          .then(res => {
-            //console.log('this.$peisAPI.print',res)
-            if (JSON.parse(res).code >= 0) {
-              //更新打印次数
-              return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.form.id])
-            }
-          })
-          .then(res => {
-            if (res.code != -1) {
-              let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id)
-              if (lfind > -1) {
-                if (this.patientRegister.prList[lfind].guidePrintTimes) {
-                  this.patientRegister.prList[lfind].guidePrintTimes = Number(this.patientRegister.prList[lfind].guidePrintTimes) + 1;
-                } else {
-                  this.patientRegister.prList[lfind].guidePrintTimes = 1;
-                }
-              }
-            }
-          })
-          .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
-          });
-
-      }
-    },
-
-    //检验申请
-    async lisRequest() {
-      let isPrintLisRequest = false
-      let res = null
-      if (this.form.id.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
-        return;
-      }
-
-      try {
-        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${this.form.id}`);
-        console.log(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${this.form.id}`, res)
-      } catch (error) {
-        return;
-      }
-      if (res.code > -1) {
-        // this.$message.info("发送检验申请成功！");
-        isPrintLisRequest = true;
-      }
-
-      //重复申请，重打
-      if (res.code == -1 && res.message.indexOf('已申请') > -1) {
-        isPrintLisRequest = true;
-      }
-
-      if (!isPrintLisRequest) return;
-
-      try {
-        await this.$confirm("是否打印检验申请单?", "提示", {
-          confirmButtonText: "是",
-          cancelButtonText: "否",
-          type: "info",
-          showClose: false,
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-        });
-      } catch (error) {
-        return;
-      }
-      //打印检验申请单
-      this.lisPrint('0003', false);
-    },
-
-    //条码打印
-    lisPrint(ReportCode, isPreview) {
-      if (this.form.id.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
-        return;
-      }
-      if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
-        return
-      }
-
-      let token = window.sessionStorage.getItem('token');
-      let user = window.sessionStorage.getItem('user');
-      let toOutShell = {
-        ReportCode, token,
-        isBuildImage:'N',
-        IsUploadPdf:'N',
-        Parameters: [
-          { Name: 'printer', Value: user },
-          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
-        ],
-      };
-
-
-      if (isPreview) {
-        //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
-        //this.multipleSelection.forEach((item,index) =>{
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
-            }
-          })
-          .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
-          });
-        // });
-      } else {
-
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${this.form.id}`)
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.print(JSON.stringify(toOutShell));
-            }
-          })
-          .then(res => {
-            if (res.code != -1) {
-              //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
-              // {
-              //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
-              //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-              //   "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-              // }
-              return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
-            }
-          })
-          .catch(err => {
-            this.$message.warning({ showClose: true, message: err});
-          });
-
-      }
-    },
-
-    //补打条码
-    reLisRequest() {
-      if (this.form.id.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
-        return;
-      }
-      this.brushTimes++;
-      this.patientRegister.lisRequestVisble = true;
-    },
-
-    //手动合并项目
-    reMergeAsbitem() {
-      if (this.form.id.length < 1) {
-        this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！"});
-        return;
-      }
-      this.brushTimes++;
-      this.patientRegister.mergeAsbitemVisble = true;
-    },
-
-    async toCharge(patientRegisterNo) {
-
-      if (!patientRegisterNo) {
-        this.$message.warning({ showClose: true, message: "请先保存人员信息！"})
-        return
-      }
-
-      try {
-        let res = await proApi.getPrAsb(this.form.id)
-        if (res.code == -1) {
-          this.$message.warning({ showClose: true, message: `操作失败，原因：${res.message}`})
-          return
-        }
-      } catch (error) {
-        this.$message.warning({ showClose: true, message: `操作失败，原因：${error}`})
-        return
-      }
-
-      this.dialogWin.charge = true
-      //多次重复点击时，刷新处理
-      this.chargePatientRegisterNo = patientRegisterNo
-      setTimeout(() => {
-        this.dataTransOpts.refresh.charge.S++
-      }, 20)
-
-    },
-
-    //关闭收费窗口时，刷新收费状态信息
-    closeDialogCharge() {
-      // this.prAsbOpraOpts.prAsbQuery++
-      this.dataTransOpts.refresh.register_check_asbitem.M++
-    },
-
-    //触发人员信息保存（更新）
-    triggerHeadSave() {
-      //id不为空则编辑 api/patientregister/updatepatientregister
-      let body = this.madePrBody()
-      // console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
-      postapi(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body).then((res) => {
-        if (res.code != -1) {
-          console.log("操作成功");
-          //一般读身份证照片时，会出现这种情况
-          if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
-          objCopy(this.form, this.patientRegister.patientRegisterRd);
-
-          this.refreshRegister(Object.assign({}, this.form))
-        }
-      });
-
-    },
-
-    // 新增保存基本信息产生新的ID，等明细保存后，再更新表单form.id
-    refreshFormId() {
-      console.log('refreshFormId', this.prAsbOpraOpts.formId)
-      this.form.id = this.prAsbOpraOpts.formId
-      this.prAsbOpraOpts.formId = '' //清空
-
-      /**/
-      // this.patientRegister.prList.push(res.data);  //列表添加记录
-      this.patientRegister.patientRegisterId = this.form.id;
-      objCopy(this.form, this.patientRegister.patientRegisterRd);
-
-      //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
-      // let curRow = deepCopy(this.patientRegister.patientRegisterRd)
-      // curRow.index = this.patientRegister.prList.length
-      // this.patientRegister.prList.push(curRow)      
-    },
-
-    //回车替代tab键
-    enterToTab() {
-      this.$nextTick(() => {
-        let inputs = document.querySelectorAll("form input"); //用数组可以读取多个标签的元素  //.inline-input
-        //console.log('inputs',inputs);
-        // 为每个输入框添加键盘事件监听器
-        inputs.forEach((input, i) => {
-
-          input.addEventListener('keydown', (event) => {
-
-            // 如果按下的是回车键
-            // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
-
-            if (event.keyCode === 13) {
-              // 阻止回车键的默认行为（换行）
-              event.preventDefault();
-
-              // 跳至下一个输入框
-              for (let j = i + 1; j < inputs.length; j++) {
-                if (inputs[j].getAttribute('disabled') != "disabled") {
-                  inputs[j].focus();
-                  break;
-                }
-              }
-            }
-          });
-        });
-
-      });
-    },
-
-  },
-
-  //监听事件
-  watch: {
-    //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.patient_register.S": {
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        this.initFormData(this.dataTransOpts.tableS.patient_register.id)
-      }
-    },
-
-    //拍照触发
-    "form.photo"(newVal, oldVal) {
-      //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
-      if (newVal != oldVal) {
-        this.getPeoplePhoto(newVal)
-      }
-    },
-
-    //修改单位触发
-    "form.customerOrgId": {
-      // immediate:true,
-      // // deep:true,
-      handler(newVal, oldVal) {
-        //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
-        if (newVal != oldVal) {
-          this.changeCustomerOrgId(newVal)
-        }
-      }
-    },
-
-  },
-};
-</script>
-<style scoped>
-.btn {
-  margin-top: 5px;
-}
-
-.commonbutton {
-  width: 100px;
-}
-
-.query {
-  margin-left: 10px;
-}
-
-.querySpan {
-  margin-right: 2px;
-}</style>
diff --git a/src/components/patientRegister/PatientRegisterItem240407.vue b/src/components/patientRegister/PatientRegisterItem240407.vue
deleted file mode 100644
index d83c41b..0000000
--- a/src/components/patientRegister/PatientRegisterItem240407.vue
+++ /dev/null
@@ -1,1189 +0,0 @@
-<template>
-  <div style="display: flex; margin-left: 10px; margin-top: 10px;">
-    <div style="width:220px;">
-      <div>
-        <span>项目类别</span>
-        <el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds" popper-class="example" style="margin-left: 3px;width:160px;"
-          :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
-          clearable filterable @change="changeItemType" size="small" :disabled="isComplete">
-        </el-cascader>
-      </div>
-      <div class="mainareaBox">
-        <el-table :data="asbItem" style="border-radius: 5px;"
-          :height="(window.pageHeight > 700 ? (window.pageHeight - 440) : 260)" @row-dblclick="dbClickChoosedAsb" highlight-current-row
-          @selection-change="handleSelectionChange" size="small" :row-class-name="handleRowClassName" 
-          @row-click="chooseAsbItem">
-          <!--
-          <el-table-column type="selection" align="center" width="40" />
-          -->
-          <el-table-column prop="displayName" label="未选组合项目" />
-          <!--
-          <el-table-column prop="price" label="标准价格" width="70">
-            <template slot-scope="scope">
-              <div style="text-align: center;">{{ scope.row.price }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="forSexId" label="适用性别" width="70">
-            <template slot-scope="scope">
-              <div style="text-align: center;">{{ ldddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}</div>
-            </template>
-          </el-table-column>
-          -->          
-        </el-table>
-      </div>
-    </div>
-
-    <div style="width:100px;margin-top: 70px;">
-      <div v-show="checkPagePriv(pagePriv.privs,'添加')" class="btnList">
-        <el-button class="commonbutton" @click="addAbs(asbItemChoosed,'choosed')" style="width:90px;" :disabled="isComplete">添加 <i class="el-icon-arrow-right"></i>
-        </el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'全添加')" class="btnList">
-        <el-button type="success" class="difference" @click="addAbs(asbItemChoosed,'all')" style="width:90px;" :disabled="isComplete">全添加 <i class="el-icon-d-arrow-right"></i>
-        </el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'移除')" class="btnList">
-        <el-button type="warning" class="commonbutton" @click="delAbs(patientRegisterAbsChoosed,'choosed')" style="width:90px;" :disabled="isComplete"><i class="el-icon-arrow-left"> 移除</i>
-        </el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'全移除')" class="btnList">
-        <el-button type="danger" class="difference" @click="delAbs(patientRegisterAbsChoosed,'all')" style="width:90px;" :disabled="isComplete"><i class="el-icon-d-arrow-left"> 全移除</i>
-        </el-button>
-      </div>
-      <!-- 不显示保存，当已选组合有修改时，失去焦点自动保存
-      <div class="btnList">
-        <el-button type="success" @click="onSubmit('保存')">保存 <i class="el-icon-check"></i>
-        </el-button>
-      </div> 
-      -->
-    </div>
-
-    <div :style="'width:' + (window.pageWidth - 110 - 20 - 230 - 100) + 'px;'">
-      <div style="display: flex;">
-        <div class="disTotal">
-          <el-tooltip class="item" effect="dark" content="根据输入的折扣，自动计算折后总价" placement="top">
-            <span>折扣 </span>
-          </el-tooltip>
-          <el-input style="width:55px;" v-model="discount" size="small" type="number" @input="changeAllDiscount"
-            @focus="discountFoucs = true" @blur="discountFoucs = false" />
-        </div>
-        <div class="disTotal">
-          <el-tooltip class="item" effect="dark" content="总金额即该人员此次体检实收金额，并根据此金额自动计算折扣" placement="top">
-            <span>总金额 </span>
-          </el-tooltip>
-          <el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal" ref="total"
-            @focus="totalFoucs = true" @blur="totalFoucs = false"/>
-        </div>
-        <div class="disTotal">
-          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" 
-            filterable :filter-method="filterMethod" :disabled="isComplete"
-            clearable @clear="quickAsb = deepCopy(asbItemQuick)" 
-            @change="quickChoosedAsb" default-first-option ref="quickAsbOCX"
-            style="width:240px;text-align: left;padding-right: 15px;">
-            <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
-          </el-select>
-        </div>
-      </div>
-      <div class="mainareaBox">
-        <el-table :data="dataTransOpts.tableM.register_check_asbitem" highlight-current-row border ref="patientRegister_patientRegisterAbs" style="border-radius: 5px;"
-          :height="(window.pageHeight > 700 ? (window.pageHeight - 440) : 260)" width="100%" :summary-method="getSummaries"
-          show-summary :row-class-name="handleRowClassName" @row-dblclick="removeAbs" @selection-change="selecteditems" size="small"
-          @row-click="removeAsbItem">
-          <!-- temporaryselection   personnelUnit.nogroupselected-->
-          <!-- 取消勾选，换成选中
-          <el-table-column type="selection" align="center"/>
-          -->
-          <el-table-column label="已选组合项目" min-width="120" prop="asbitemName" >
-            <template slot-scope="scope">
-              <div>
-                <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="top">
-                  <i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 14px;color: purple;"></i>
-                </el-tooltip>
-                {{ scope.row.asbitemName }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="标准价格" prop="standardPrice" min-width="70" align="center" />
-          <el-table-column label="折扣" prop="discount" min-width="60">
-            <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.discount" size="small" @input="changeDiscount(scope.$index)" />
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" prop="amount" min-width="50">
-            <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.amount" size="small" @input="changeDiscount(scope.$index)" />
-            </template>
-          </el-table-column>
-          <el-table-column label="实收价格" prop="chargePrice" min-width="70">
-            <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.chargePrice" size="small"
-                @input="changePrice(scope.$index)" /> <!--立即触发保存 @blur="onSubmit('')"  -->
-            </template>
-          </el-table-column>
-          <el-table-column prop="total" label="金额" min-width="70" align="center"/>
-          <el-table-column prop="standardPrice" label="标准金额" min-width="70" v-if="false" />
-          <el-table-column label="支付方式" prop="payTypeFlag" min-width="100">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.payTypeFlag" size="small">
-                <el-option v-for="item in dict.payType" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column prop="isCharge" label="收费" min-width="40" align="center">
-            <template slot-scope="scope">
-              <el-checkbox :value="scope.row.isCharge == 'Y'" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="checkCompleteFlag" label="状态" min-width="40" align="center">
-            <template slot-scope="scope">
-              <div>{{ dddw(dict.checkCompleteFlag, "id", scope.row.checkCompleteFlag, "displayName") }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="isLock" label="锁" min-width="40" align="center">
-            <template slot-scope="scope">
-              <el-checkbox :value="scope.row.isLock == 'Y'" />
-            </template>
-          </el-table-column>
-          <el-table-column prop="creatorName" label="登记人" min-width="70" align="center"></el-table-column>
-          <el-table-column prop="creationTime" label="登记日期" win-width="90" align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.creationTime ? moment(scope.row.creationTime).format('yyyy-MM-DD'):'' }}</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import moment from 'moment';
-import { mapState, mapActions } from "vuex";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv,checkPagePriv, arrayFilter, arrayReduce, arrayExistObj, dddw, deepCopy, tcdate} from "../../utlis/proFunc";
-import proApi from "../../utlis/proApi";
-
-export default {
-  props: ["prForm","prAsbOpraOpts","triggerHeadSave","refreshFormId"],
-  data() {
-    return {
-      pagePriv:{
-        routeUrlorPageName:'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
-        privs:[] // 页面权限
-      },
-      oldFormId:'',     //配合登记人员复制新增使用
-      itemType: [],     //项目类别
-      itemTypeIds: '', //被选中的项目类别ID
-      asbItem:[],      //左侧显示的未选组合项目
-      asbItemAll:[],   //所有未选组合项目
-
-      asbItemChoosed: [], //勾选的  未选组合项目
-      startPoint:-1,
-
-      //patientRegisterAbs:[],         //体检人员所选组合项目 放vuex
-      patientRegisterAbsChoosed: [], //勾选的 体检人员所选组合项目
-      PstartPoint:-1,
-      //patientRegisterAbsDel: [], //体检人员 待删除的组合项目
-
-
-      prAsb:[],  //当前显示的已选组合项目（新增与编辑的在一起）
-      prAsbDels:[], //待提交 删除的组合项目
-
-      groupAsbs:[],   //分组包含的项目
-      packageAsbs:[], //套餐包含的项目
-   
-
-      asbItemId: '',
-      discount: 100,
-      total: 0,
-      totalStand: 0,
-      quickAsb: [],
-      asbItemQuick:[],
-      totalFoucs: false,    //总价是否获取焦点
-      discountFoucs: false, //总折扣是否获取焦点
-    };
-  },
-  computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "personnelUnit"]),
-    //是否总检
-    isComplete(){
-      return this.prForm.completeFlag == '3' ? true:false;
-    },
-
-  },
-
-  created(){
-    //获取用户当前页面的权限
-    let userPriv = window.sessionStorage.getItem('userPriv')
-    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-
-    this.dictInit()    
-  },
-
-  updated(){
-    this.$nextTick(() => {
-      this.$refs['patientRegister_patientRegisterAbs'].doLayout()
-    })
-  },
-  mounted() { 
-    this.getPrAsb(this.dataTransOpts.tableS.patient_register.id)
-  },
-
-  methods: {
-    ...mapActions(['getCustomerOrgGroup', 'getPatientRegisterAbs']),
-    dddw,moment,deepCopy,checkPagePriv,
-
-    // 初始化字典信息
-    dictInit(){
-      
-      // 项目类别 树结构
-      getapi("/api/app/item-type/by-code-all").then((res) => {
-        if (res.code != -1) {
-          this.dict.itemTypeTree = res.data;
-          tcdate(this.dict.itemTypeTree);
-        }
-      });
-
-      // 获取组合项目
-      postapi('/api/app/asbitem/GetBasicList',{isFilterActive:'Y'}).then(res =>{
-        if(res.code != -1){
-          this.asbItem = res.data
-          this.asbItemAll = res.data
-          this.asbItemQuick = res.data
-          this.quickAsb = res.data
-        }
-      });
-    },
-
-    // 获取人员组合项目信息
-    async getPrAsb(id){
-      // debugger
-      // 清空待删除、分组、套餐
-      console.log('getPrAsb(id)',`getPrAsb(${id})`)
-      this.prAsbDels = []
-      this.groupAsbs = []
-      this.packageAsbs = []
-
-      let result = await proApi.getPrAsb(id)
-      this.dataTransOpts.tableM.register_check_asbitem = result.data
-      this.refreshAsbitem()  
-    },
-
-    // 复制新增 拷贝明细项目
-    async copyNew(){
-      if(this.oldFormId){
-        let result = await proApi.getPrAsb(this.oldFormId)
-        this.dataTransOpts.tableM.register_check_asbitem = result.data
-         this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-          e.id = '';
-          e.patientRegisterId = '';
-          e.isCharge = 'N';
-          e.checkCompleteFlag = '0'
-          e.isLock = 'N'
-        })
-        this.refreshAsbitem()
-      }
-    },
-
-    // 刷新未选组合项目
-    refreshAsbitem(){
-      let asbItemAll = deepCopy(this.asbItemAll)
-      let choosedAsb =  this.dataTransOpts.tableM.register_check_asbitem.filter(e => {
-        return e.checkCompleteFlag == '0' || !(e.checkCompleteFlag)
-      }) // 如果已经检查，则可以重新选进来（复查）
-
-      arrayReduce(asbItemAll, choosedAsb, "id=asbitemId");
-      this.changeItemType();       
-      this.asbItemQuick = deepCopy(asbItemAll);      
-      this.quickAsb = deepCopy(asbItemAll);
-    },
-    
-    handleRowClassName({ row, rowIndex }) {
-      if (row.choosed) {
-        return 'current-row';
-      } else {
-        return '';
-      }
-    },
-
-    //选择 未选的组合项目
-    chooseAsbItem(row){
-      this.asbItem.forEach((e,index) => {
-        e.index = index; 
-        return e
-      });
-      // 按住了shift键
-      if (this.window.shift) {         
-        //清除所有选择
-        this.asbItem.forEach(e => {
-          e.choosed = false;  
-          return e
-        });
-
-        if (this.startPoint == - 1) {
-          this.asbItem[row.index].choosed = true;
-          this.startPoint = row.index;
-          return
-        }
-
-        if (this.startPoint > row.index) {
-          for (let i = row.index; i <= this.startPoint; i++) {
-            this.asbItem[i].choosed = true
-          }
-        } else if (this.startPoint <= row.index) {
-          for (let i = this.startPoint; i <= row.index; i++) {
-            this.asbItem[i].choosed = true
-          }
-        }
-        return
-      }
-
-      // 按住了ctrl 键
-      if (this.window.ctrl) {   
-        console.log('this.window.ctrl',this.window.ctrl,this.asbItem)      
-        this.asbItem[row.index].choosed = true;
-        this.startPoint = row.index;
-        return        
-      }
-
-      // 未按住了ctrl 、shift 键
-      //清除所有选择
-      //console.log('清除所有选择')
-      this.asbItem.forEach(e => {
-        e.choosed = false;  
-        return e
-      });
-      this.asbItem[row.index].choosed = true;
-      this.startPoint = row.index;   
-
-    },
-
-    //选择 已选的组合项目
-    removeAsbItem(row){
-       this.dataTransOpts.tableM.register_check_asbitem.forEach((e,index) => {
-        e.index = index; 
-        return e
-      });
-      // 按住了shift键
-      if (this.window.shift) {         
-        //清除所有选择
-         this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-          e.choosed = false;  
-          return e
-        });
-
-        if (this.PstartPoint == - 1) {
-           this.dataTransOpts.tableM.register_check_asbitem[row.index].choosed = true;
-          this.PstartPoint = row.index;
-          return
-        }
-
-        if (this.PstartPoint > row.index) {
-          for (let i = row.index; i <= this.PstartPoint; i++) {
-             this.dataTransOpts.tableM.register_check_asbitem[i].choosed = true
-          }
-        } else if (this.PstartPoint <= row.index) {
-          for (let i = this.PstartPoint; i <= row.index; i++) {
-             this.dataTransOpts.tableM.register_check_asbitem[i].choosed = true
-          }
-        }
-        return
-      }
-
-      // 按住了ctrl 键
-      if (this.window.ctrl) {   
-        console.log('this.window.ctrl',this.window.ctrl,this.dataTransOpts.tableM.register_check_asbitem)      
-         this.dataTransOpts.tableM.register_check_asbitem[row.index].choosed = true;
-        this.PstartPoint = row.index;
-        return        
-      }
-
-      // 未按住了ctrl 、shift 键
-      //清除所有选择
-      //console.log('清除所有选择')
-       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        e.choosed = false;  
-        return e
-      });
-       this.dataTransOpts.tableM.register_check_asbitem[row.index].choosed = true;
-      this.PstartPoint = row.index;   
-
-    },
-
-    //更新所选组合项目
-    async onSubmit(msg) {
-      let ret = false
-
-      ret = await this.batchAddAsb()
-      if(!ret){
-        if(msg) this.$message.warning({ showClose: true, message: `组合项目 ${msg} 失败！`})
-        return
-      }
-
-      ret = await this.batchDelAsb()
-      if(!ret){
-        if(msg) this.$message.warning({ showClose: true, message: `组合项目 ${msg} 失败！`})
-        return
-      }
-
-      ret = await this.batchEditAsb()
-      if(!ret){
-        if(msg) this.$message.warning({ showClose: true, message: `组合项目 ${msg} 失败！`})
-        return
-      }
-      
-      console.log('this.prAsbOpraOpts.formId',this.prAsbOpraOpts.formId)
-      if(this.prAsbOpraOpts.formId){
-        this.refreshFormId()        
-      }else{ 
-        //触发保存人员基本信息        
-        this.triggerHeadSave()
-        this.getPrAsb(this.prForm.id)
-      }
-    },
-
-    //未选组合项目 勾选情况
-    handleSelectionChange(val) {
-      // this.selecteddata = val;
-      this.asbItemChoosed = val;
-      //console.log(this.asbItemChoosed);
-    },
-
-    
-
-    // 添加组合项目
-    ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
-    addAbs(asbItemChoosed,oprType) {      
-      let checked = true
-      let payTypeFlag = '0' //默认个人支付
-      
-
-      //勾选时不需要此操作  start
-      if(oprType && oprType == 'all'){
-        asbItemChoosed = deepCopy(this.asbItem)
-      }else if(oprType && oprType == 'choosed'){
-        asbItemChoosed = [] 
-        this.asbItem.forEach(e =>{
-          if(e.choosed){
-            asbItemChoosed.push(e)
-            e.choosed = false
-          }
-        })
-      }
-      //勾选时不需要此操作  end 
-
-      if (asbItemChoosed.length < 1) {
-        this.$message.warning({ showClose: true, message: "请选择要添加的组合项目"})
-        return
-      }
-
-      //性别、年龄判断 
-      // "displayName": "身高体重",
-      //   "shortName": "哈f哈",
-      //   "forSexId": "F",
-      //   "itemTypeId": "3a0b16de-75b9-c910-c61b-844709a88940",
-      //   "price": 0,
-      console.log('asbItemChoosed.length', asbItemChoosed.length)
-      for (let i = 0; i < asbItemChoosed.length; i++) {
-        if (this.prForm.sexId == 'U') break //未选性别时，无需判断组合项目性别限制
-        if (asbItemChoosed[i].forSexId == 'A') continue
-        if (asbItemChoosed[i].forSexId != this.prForm.sexId) {
-          this.$message.warning({ showClose: true, message: `所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`})
-          checked = false
-          break
-        }
-      }
-      //console.log(222,checked)
-      if (!checked) return
-
-      if (this.prForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'
-      for (let i = 0; i < asbItemChoosed.length; i++) {
-        let pojo = {
-          asbitemId: asbItemChoosed[i].id,
-          asbitemName: asbItemChoosed[i].displayName,
-          patientRegisterId: this.prForm.id||this.dict.personOrgId,
-          standardPrice: asbItemChoosed[i].price,
-          chargePrice: asbItemChoosed[i].price,
-          payTypeFlag,
-          isCharge: "N",
-          checkCompleteFlag:'0',
-          discount:100,
-          amount: 1,
-          total: asbItemChoosed[i].price,
-        }        
-         this.dataTransOpts.tableM.register_check_asbitem.push(pojo)
-      }
-
-      this.refreshAsbitem()
-
-    },
-
-    //人员已选组合项目 勾选情况
-    selecteditems(val) {
-      this.patientRegisterAbsChoosed = val
-    },
-
-    //批量提交添加组合项目
-    async batchAddAsb() {
-      let ret = false
-      let patientRegisterId = this.prForm.id || this.prAsbOpraOpts.formId
-      if(!patientRegisterId){
-        this.$message.warning({ showClose: true, message: "人员基本信息未保存"});
-        return ret
-      }
-
-      let registerAsbitems = []
-
-       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if(!e.id){
-          registerAsbitems.push({
-            asbitemId: e.asbitemId,
-            patientRegisterId,
-            standardPrice: e.standardPrice,
-            chargePrice: e.chargePrice,
-            payTypeFlag: e.payTypeFlag,
-            isCharge: e.isCharge,
-            amount: e.amount,
-            groupPackageId: e.groupPackageId
-          })
-        }
-      })
-
-      if(registerAsbitems.length == 0) return true
-
-      let body = {
-        medicalCenterId:this.prForm.medicalCenterId,
-        registerAsbitems,
-        isAutoMerger:'Y'
-      }
-
-      try {
-        let res = await postapi('/api/app/registerasbitem/createregisterasbitemmany', body)
-        if(res.code != -1) ret = true
-      } catch (error) {
-        // console.log('批量添加组合项目失败',error)
-        this.$message.error({ showClose: true, message: error})
-      }
-
-      return ret
-      
-    },
-
-    //批量提交更新组合项目
-    async batchEditAsb() {
-      let ret = false
-      let body = []
-
-
-       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if(e.id){
-          body.push({
-            registerAsbitemId:e.id,
-            input: {
-              chargePrice: e.chargePrice,
-              payTypeFlag: e.payTypeFlag,
-              isCharge: e.isCharge,
-              amount: e.amount,
-              groupPackageId: e.groupPackageId
-            }
-          })          
-        }
-      })
-      if(body.length == 0) return true
-
-      try {
-        let res = await postapi(`/api/app/registerasbitem/updatemany`, body)
-        if(res.code != -1) ret = true
-      } catch (error) {
-        console.log('批量提交更新组合项目失败',error)
-      }
-      return ret
-    },
-
-    //批量提交删除组合项目
-    async batchDelAsb() {
-      let ret = false
-      if(this.prAsbDels.length == 0) return true
-
-      let registerAsbitemIds=[]
-
-      this.prAsbDels.forEach(e => {
-        registerAsbitemIds.push(e.id)
-      })
-
-      console.log(`/api/app/registerasbitem/deletemany`, {registerAsbitemIds})
-
-      try {
-        let res = await postapi(`/api/app/registerasbitem/deletemany`, {registerAsbitemIds})
-        if(res.code != -1) ret = true
-      } catch (error) {
-        console.log('批量删除组合项目失败',error)
-      }
-
-      return ret
-    },
-
-    //删除 人员已选中的组合项目
-    ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
-    delAbs(absForDel,oprType) {      
-      let chargeComplete = ''
-      let lfind = -1
-      let tempRd = {}
-
-      //勾选时不需要此操作  start
-      if(oprType && oprType == 'all'){
-        absForDel = deepCopy(this.dataTransOpts.tableM.register_check_asbitem)
-      }else if(oprType && oprType == 'choosed'){
-        absForDel = [] 
-         this.dataTransOpts.tableM.register_check_asbitem.forEach(e =>{
-          if(e.choosed){
-            absForDel.push(e)
-            e.choosed = false
-          }
-        })
-      }
-      //勾选时不需要此操作  end 
-
-      if (absForDel.length < 1) {
-        this.$message.warning("请选择要移除的组合项目")
-        return
-      }
-
-      absForDel.forEach(e => {
-        // 如果已经收费 或 体检，则不允许删除
-        if (e.isCharge == 'Y' || (e.checkCompleteFlag && e.checkCompleteFlag != '0')) {
-          chargeComplete += e.asbitemName + '，'   
-        }else{
-          lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.asbitemId)
-          if(lfind > -1){
-            tempRd = Object.assign({}, this.dataTransOpts.tableM.register_check_asbitem.splice(lfind,1)[0])
-            if(e.id) this.prAsbDels.push(tempRd)
-          }    
-        }            
-      })
-
-      //刷新
-      this.refreshAsbitem()
-
-      if (chargeComplete) {
-        this.$message.info({ showClose: true, message:  `所选项目：${chargeComplete}已收费或已检，不可删除！` });
-      }
-
-    },
-
-    //双击删除已选项目
-    removeAbs(row) {
-      if(this.isComplete){
-        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目'})
-        return
-      } 
-      this.delAbs([row]);
-    },
-
-    //项目类别过滤 组合项目，未过滤已选择的组合项目
-    changeItemType() {
-      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
-      let asbItemAll = deepCopy(this.asbItemAll)
-      let lv = "";
-      if (typeof this.itemTypeIds == "object") {
-        if(this.itemTypeIds.length > 0) lv = this.itemTypeIds[this.itemTypeIds.length - 1];
-      }
-
-      if (lv) {
-        this.asbItem = arrayFilter(asbItemAll, "itemTypeId", lv);
-      } else {
-        this.asbItem = deepCopy(asbItemAll);
-      }
-      arrayReduce(this.asbItem, this.dataTransOpts.tableM.register_check_asbitem, "id=asbitemId");
-    },
-
-     
-
-    //选中 分组 所包含的组合项目
-    getGroupAsbs(id){
-      if(!id){
-        this.groupAsbs = []
-        this.changeGroup(id)
-        return
-      }
-      
-      getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${id}`)
-      .then((res) => {
-        if(res.code != -1){          
-          this.groupAsbs = res.data
-          this.changeGroup(id)
-        }
-      });
-      
-    },
-
-    //选中 套餐 所包含的组合项目
-    getPackageAsbs(id){
-      if(!id){
-        this.packageAsbs = []
-        this.changePackage(id)
-        return
-      }
-
-      postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem',{medicalPackageId:id})
-      .then((res) => {
-        if(res.code != -1){
-          this.packageAsbs = res.data
-          this.changePackage(id)
-        }
-      });
-    },
-
-    // 更换分组 
-    changeGroup(newId){
-      //已收费项目，不更改收费方式、价格及数量，只更改分组id
-      let payTypeFlag = '0'
-      let lfind = -1
-      let tempRd = {}
-
-      if(!newId){
-        this.setGroupPackageNull()
-        return
-      }
-
-      if (this.prForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'  //单位支付
-
-      for(let i =  this.dataTransOpts.tableM.register_check_asbitem.length - 1;i>-1;i--){
-        lfind = arrayExistObj(this.groupAsbs,'asbitemId', this.dataTransOpts.tableM.register_check_asbitem[i].asbitemId)
-        if(lfind > -1){
-          //找到了则更新此项目
-          tempRd = Object.assign({},this.groupAsbs.splice(lfind,1)[0])
-           this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = newId
-          if( this.dataTransOpts.tableM.register_check_asbitem[i].isCharge != 'Y'){
-             this.dataTransOpts.tableM.register_check_asbitem[i].payTypeFlag = payTypeFlag
-             this.dataTransOpts.tableM.register_check_asbitem[i].amount = tempRd.customerOrgGroupDetailAmount
-             this.dataTransOpts.tableM.register_check_asbitem[i].standardPrice = tempRd.price            
-             this.dataTransOpts.tableM.register_check_asbitem[i].chargePrice = tempRd.customerOrgGroupDetailPrice
-             this.dataTransOpts.tableM.register_check_asbitem[i].discount = tempRd.discount
-          }
-        }else{
-          //没找到则移除此项目
-          if( this.dataTransOpts.tableM.register_check_asbitem[i].isCharge == 'Y' || ( this.dataTransOpts.tableM.register_check_asbitem[i].checkCompleteFlag &&  this.dataTransOpts.tableM.register_check_asbitem[i].checkCompleteFlag != '0')){
-             this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = null
-          }else{
-            tempRd = Object.assign({}, this.dataTransOpts.tableM.register_check_asbitem.splice(i,1)[0])
-            if(tempRd.id) this.prAsbDels.push(tempRd)
-          }
-        }
-      }
-
-      // debugger
-      //未找到则添加(如果在待删除中找到记录，则待删除中记录移至当前显示记录中来)
-      this.groupAsbs.forEach(e =>{
-        lfind = arrayExistObj(this.prAsbDels,'asbitemId',e.asbitemId)
-        if(lfind > -1){
-          tempRd = Object.assign(this.prAsbDels.splice(lfind,1)[0],
-            {
-              groupPackageId:newId,
-              standardPrice:e.price,
-              chargePrice:e.customerOrgGroupDetailPrice,
-              payTypeFlag,
-              isCharge: "N",
-              discount:e.discount,
-              amount:e.customerOrgGroupDetailAmount,
-              total: Math.round(e.customerOrgGroupDetailAmount * e.customerOrgGroupDetailPrice * 100)/100
-            }
-          )
-        }else{
-          tempRd = {  
-            groupPackageId:newId,       
-            asbitemId:e.asbitemId,
-            asbitemName:e.displayName,
-            patientRegisterId:this.prForm.id,
-            standardPrice:e.price,
-            chargePrice:e.customerOrgGroupDetailPrice,
-            payTypeFlag,
-            isCharge: "N",
-            discount:e.discount,
-            amount:e.customerOrgGroupDetailAmount,
-            total: Math.round(e.customerOrgGroupDetailAmount * e.customerOrgGroupDetailPrice * 100)/100
-          }
-        }
-         this.dataTransOpts.tableM.register_check_asbitem.push(tempRd)
-      })
-
-      this.refreshAsbitem()
-    },
-
-    // 更换套餐 
-    changePackage(newId){
-      //已收费项目，不更改收费方式、价格及数量，只更改分组id
-      let payTypeFlag = '0'
-      let lfind = -1
-      let tempRd = {}
-
-      if(!newId){
-        this.setGroupPackageNull()
-        return
-      }
-
-      if (this.prForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'  //单位支付
-
-      for(let i =  this.dataTransOpts.tableM.register_check_asbitem.length - 1;i>-1;i--){
-        lfind = arrayExistObj(this.packageAsbs,'id', this.dataTransOpts.tableM.register_check_asbitem[i].asbitemId)
-        if(lfind > -1){
-          //找到了则更新此项目
-          tempRd = Object.assign({},this.packageAsbs.splice(lfind,1)[0])
-           this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = newId
-          if( this.dataTransOpts.tableM.register_check_asbitem[i].isCharge != 'Y'){
-             this.dataTransOpts.tableM.register_check_asbitem[i].payTypeFlag = payTypeFlag
-             this.dataTransOpts.tableM.register_check_asbitem[i].amount = tempRd.medicalPackageDetailAmount
-             this.dataTransOpts.tableM.register_check_asbitem[i].standardPrice = tempRd.price            
-             this.dataTransOpts.tableM.register_check_asbitem[i].chargePrice = tempRd.medicalPackageDetailPrice
-             this.dataTransOpts.tableM.register_check_asbitem[i].discount = tempRd.discount
-          }
-        }else{
-          //没找到则移除此项目
-          if( this.dataTransOpts.tableM.register_check_asbitem[i].isCharge == 'Y' || ( this.dataTransOpts.tableM.register_check_asbitem[i].checkCompleteFlag &&  this.dataTransOpts.tableM.register_check_asbitem[i].checkCompleteFlag != '0')){
-             this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = null
-          }else{
-            tempRd = Object.assign({}, this.dataTransOpts.tableM.register_check_asbitem.splice(i,1)[0])
-            if(tempRd.id) this.prAsbDels.push(tempRd)
-          }
-        }
-      }
-
-      //未找到则添加(如果在待删除中找到记录，则待删除中记录移至当前显示记录中来)
-      this.packageAsbs.forEach(e =>{
-        lfind = arrayExistObj(this.prAsbDels,'asbitemId',e.id)
-        if(lfind > -1){
-          tempRd = Object.assign(this.prAsbDels.splice(lfind,1)[0],
-            {
-              groupPackageId:newId,
-              standardPrice:e.price,
-              chargePrice:e.medicalPackageDetailPrice,
-              payTypeFlag,
-              isCharge: "N",
-              discount:e.discount,
-              amount:e.medicalPackageDetailAmount,
-              total: Math.round(e.medicalPackageDetailAmount * e.medicalPackageDetailPrice * 100)/100
-            }
-          )
-        }else{
-          tempRd = {
-            groupPackageId:newId,
-            asbitemId:e.id,
-            asbitemName:e.displayName,
-            patientRegisterId:this.prForm.id,
-            standardPrice:e.price,
-            chargePrice:e.medicalPackageDetailPrice,
-            payTypeFlag,
-            isCharge: "N",
-            discount:e.discount,
-            amount:e.medicalPackageDetailAmount,
-            total: Math.round(e.medicalPackageDetailAmount * e.medicalPackageDetailPrice * 100)/100
-          }
-        }
-         this.dataTransOpts.tableM.register_check_asbitem.push(tempRd)
-      })
-
-      this.refreshAsbitem()
-    },
-
-    // 从 有分组/套餐 切换成 无分组/套餐 时
-    setGroupPackageNull(){
-       this.dataTransOpts.tableM.register_check_asbitem.forEach(e =>{
-        e.groupPackageId = null
-      })
-    },
-   
-    //双击选择组合项目
-    dbClickChoosedAsb(row) {
-      if(this.isComplete){
-        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目'})
-        return
-      } 
-      this.addAbs([row]);
-    },
-
-    //快速选择组合项目
-    quickChoosedAsb(v) {
-      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
-      let lfind = -1
-      if (v) {
-        lfind = arrayExistObj(this.asbItemQuick, 'id', v)
-        if (lfind > -1) {
-          this.addAbs([this.asbItemQuick[lfind]])
-        }
-      }    
-      //this.$refs['quickAsbOCX'].focus(); //asbItemId
-      this.$nextTick(() => {        
-        this.$refs['quickAsbOCX'].blur(); //total  asbItemId
-        this.asbItemId = ''
-        this.quickAsb = deepCopy(this.asbItemQuick)        
-        this.$refs['quickAsbOCX'].focus(); //total  asbItemId       
-      });
-      
-    },
- 
-
-    //快速选择组合项目时，调整可按拼间简码及简称查找
-    filterMethod(keyWords) {
-      //console.log('filterMethod',this.asbItemQuick)  
-      if (keyWords) {
-        this.quickAsb = [];
-        this.asbItemQuick.forEach(item => {
-          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-            || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
-            this.quickAsb.push(item);
-          }
-        });
-      } else {
-        this.quickAsb = deepCopy(this.asbItemQuick);
-      }
-    },    
-
-    //修改总折扣
-    changeAllDiscount() {
-
-      if (!this.discount || this.discount == 0) return
-      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
-
-       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        e.discount = this.discount
-        e.chargePrice = Math.round(e.standardPrice * this.discount) / 100
-        e.total = Math.round(e.standardPrice * this.discount * e.amount) / 100
-      });
-      // this.onSubmit('')
-
-    },
-
-    //修改总金额
-    changeTotal() {
-
-      if (!this.total) return
-      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
-
-      let sumChargeDetails = Number(0) //单个标准价折后价 合计总计 
-      let qtyIsOneLast = 0   //数量为1的最后行项目，用于返写金额
-
-      // console.log('this.total / this.totalStand',this.total , this.totalStand)
-      this.discount = Math.round((100 * this.total / this.totalStand) * 100)/100
-
-       this.dataTransOpts.tableM.register_check_asbitem.forEach((e, index) => {        
-        if (e.amount == 1 && e.standardPrice != 0) qtyIsOneLast = index
-        e.discount = this.discount
-        e.chargePrice = Math.round((e.standardPrice * this.discount / 100) * 100)/100
-        e.total = Math.round((e.standardPrice * this.discount * e.amount / 100) * 100)/100
-        sumChargeDetails += Math.round((e.standardPrice * this.discount * e.amount / 100) * 100)/100
-      });
-      console.log('this.dataTransOpts.tableM.register_check_asbitem',this.dataTransOpts.tableM.register_check_asbitem)
-
-      // console.log('this.total - sumChargeDetails', sumChargeDetails, this.total - sumChargeDetails)
-      //平衡金额（按总价折扣后，再根据折扣合计 会出现金额差）
-      if (this.total != sumChargeDetails) {
-        console.log('qtyIsOneLast',qtyIsOneLast)
-         this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total = 
-          Math.round((Number( this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total) + Number(this.total) - Number(sumChargeDetails))*100)/100
-         this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].chargePrice = 
-          Math.round( this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total * 100 /  this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].amount)/100
-        if( this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].standardPrice != 0){
-           this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].discount = 
-            Math.round( this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].chargePrice * 10000/ this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].standardPrice)/100
-        }
-      }
-      //this.onSubmit('')
-    }, 
-
-    //修改数量
-    changeDiscount(index) {
-      //console.log('index',index)
-      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
-      if (! this.dataTransOpts.tableM.register_check_asbitem[index].discount) return
-      //console.log( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice, this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)
-       this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice = Math.round( this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice *  this.dataTransOpts.tableM.register_check_asbitem[index].discount)/100
-       this.dataTransOpts.tableM.register_check_asbitem[index].total =  this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice *  this.dataTransOpts.tableM.register_check_asbitem[index].amount
-      // this.onSubmit('')
-    },
-
-    //修改单价
-    changePrice(index) {
-      //console.log('index',index)
-      if (!this.dataTransOpts.tableM.register_check_asbitem ||  this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
-      if (! this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice) return
-      //console.log( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice, this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)
-       this.dataTransOpts.tableM.register_check_asbitem[index].discount = Math.round( this.dataTransOpts.tableM.register_check_asbitem[index].chargePrice * 10000 /  this.dataTransOpts.tableM.register_check_asbitem[index].standardPrice)/100
-      // this.onSubmit('')
-    },
-
-    //自定义计算列
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sumCol = [1, 5]  //需合计的列
-      const sums = [];
-      columns.forEach((column, index) => {
-        //console.log('column, index,data',column, index,data)
-        //显示合计列
-        if (index === 0) {
-          sums[index] = '合计';
-          return;
-        }
-
-        //不合计的列
-        if (sumCol.indexOf(index) == -1) {
-          sums[index] = '';
-          return;
-        }
-
-        sums[index] = 0
-        data.forEach(e => {
-          if (!isNaN(e[column.property])){
-            if(index == 1){
-              sums[index] += e[column.property] * e['amount']
-            }else{
-              sums[index] += e[column.property]
-            }            
-          }
-        })
-        sums[index] = Math.round(sums[index] * 100)/100 //+ ' 元';
-
-        // const values = data.map(item => Number(item[column.property]));
-        // if (!values.every(value => isNaN(value))) {
-        //   sums[index] = values.reduce((prev, curr) => {
-        //     const value = Number(curr);
-        //     if (!isNaN(value)) {
-        //       //return prev + curr;  //原始
-        //       return prev + curr;  //改造
-        //     } else {
-        //       return prev;
-        //     }
-        //   }, 0);
-        //   sums[index] = sums[index].toFixed(2) + ' 元';
-        // } else {
-        //   sums[index] = 'N/A';
-        // }
-
-      });
-      this.totalStand = sums[1];
-      //console.log('this.totalFoucs/this.discountFoucs',this.totalFoucs,this.discountFoucs)
-      if (!this.totalFoucs) this.total = sums[5];
-      if (!this.discountFoucs) this.discount = Math.round(this.total * 10000 / this.totalStand)/100;
-      return sums;
-    },
-  },
-
-  //监听事件
-  watch: {    
-    // //配合复制新增使用 查询人员下的组合项目
-    // "prForm.id":{
-    //   immediate: true, // 立即执行
-    //   // deep: true, // 深度监听复杂类型内变化
-    //   handler(newVal,oldVal){
-    //     console.log('人员登记 组合项目明细，人员id:',newVal,oldVal)
-    //     this.oldFormId = oldVal   
-    //     this.getPrAsb(newVal)
-    //     // if(newVal != oldVal){
-    //     //   this.getPrAsb(newVal)
-    //     // }     
-    //   }
-    // },
-
-    // //人员 id 未变的情况下，亦可触发刷新组合项目
-    // "prAsbOpraOpts.prAsbQuery":{
-    //   // immediate: true, // 立即执行
-    //   // deep: true, // 深度监听复杂类型内变化
-    //   handler(newVal,oldVal){        
-    //     console.log('watch:prAsbOpraOpts.prAsbQuery:',newVal,oldVal)
-    //     if(newVal != oldVal){
-    //       this.getPrAsb(this.prForm.id)
-    //     }
-    //   }
-    // },
-
-    "dataTransOpts.refresh.register_check_asbitem.D":{
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal,oldVal){        
-        console.log('watch: 刷新 人员登记/编辑 时的组合项目: ',this.dataTransOpts.tableS.patient_register.id)
-        if(newVal != oldVal) this.getPrAsb(this.dataTransOpts.tableS.patient_register.id)        
-      }
-    },
-
-    //按钮更新支付方式
-    "prAsbOpraOpts.payTypeFlag":{
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {
-        if (newVal != oldVal && newVal != '') {
-           this.dataTransOpts.tableM.register_check_asbitem.forEach(e =>{
-            e.payTypeFlag = newVal;
-            return e;
-          });
-          // this.onSubmit('调整支付方式');
-        }
-      }
-    },
-
-    //更换分组
-    "prAsbOpraOpts.prAsbGroup":{
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {        
-        if (newVal != oldVal) {
-          this.getGroupAsbs(this.prForm.customerOrgGroupId)
-        }
-      }
-    },
-
-    //更换套餐
-    "prAsbOpraOpts.prAsbPackage":{
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {
-        if (newVal != oldVal) {
-          this.getPackageAsbs(this.prForm.medicalPackageId)
-        }
-      }
-    },
-
-    //复制新增 拷贝明细项目
-    "prAsbOpraOpts.copyNew":{
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {
-        if (newVal != oldVal) {
-          this.copyNew()
-        }
-      }
-    },
-
-    //体检信息保存，触发已选组合项目保存
-    "prAsbOpraOpts.prAsbSave"(newVal, oldVal) {
-      console.log("patientRegister.saveTimes newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal) {
-        this.onSubmit('');
-      }
-    },
-
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "../../assets/css/global_table.css";
-@import "../../assets/css/global_input.css";
-@import "../../assets/css/global.css";
-
-.mainareaBox {
-  border: 1px solid #888; 
-  height: v-bind("(window.pageHeight > 700 ? (window.pageHeight - 440) : 260) + 'px'");
-  margin-top: 5px;
-  border-radius: 5px;
-}
-
-.btnList {
-  margin-top: 5px;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-.disTotal {
-  margin-left: 10px;
-}
-
-</style>
-
diff --git a/src/views/customerOrg/patientLis.vue b/src/views/customerOrg/patientLis.vue
index fc71a30..7f87df2 100644
--- a/src/views/customerOrg/patientLis.vue
+++ b/src/views/customerOrg/patientLis.vue
@@ -137,9 +137,9 @@ export default {
       });
 
       //分组，所有分组，不限单位，不限次数
-      getapi("/api/app/customer-org-group?MaxResultCount=1000").then((res) => {
-        if (res.code == 1) {
-          this.dict.customerOrgGroupAll = res.data.items;
+      getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
+        if (res.code > -1) {
+          this.dict.customerOrgGroupAll = res.data;
         }
       });