diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 4ca5f9b..3499b9d 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -305,7 +305,7 @@ export default {
         }
       },
 
-      hisResultDetailDialogVisible: true,
+      hisResultDetailDialogVisible: false,
     };
   },
 
@@ -352,6 +352,17 @@ export default {
   methods: {
     dddw,
     dictInit() {
+      // 获取系统参数(是否显示历次明细结果)
+      postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'doctor_check_disp_hisdetail' })
+        .then(res => {
+          if(res.code > -1){
+            let hisResultDetailDialogVisible = res.data||"N"
+            if(hisResultDetailDialogVisible == 'Y'){
+              this.hisResultDetailDialogVisible = true
+            }
+          }
+        }) 
+
       //获取结果状态提示数据
       getapi("/api/app/result-status").then((res) => {
         if (res.code != -1) {
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 2d80d5c..6fb88b4 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -462,7 +462,8 @@ export default {
                 pictureBaseStrs: [{
                   fileName,
                   localPathName: item.FilePath,
-                  pictureBaseStr: baseHead + item.Image
+                  pictureBaseStr: baseHead + item.Image,
+                  isPrint:'N'
                 }],
                 pictureFileType: '0' //采图暂定图0，上传暂定报告1 this.pictureFileType
               }
diff --git a/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue b/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue
index c4a03fa..d3f9f86 100644
--- a/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue
+++ b/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue
@@ -56,7 +56,7 @@ export default {
 
   // 组件创建完成
   created() {
-    this.asbitemBatchInit = deepCopy(this.asbitemBatch)
+    //this.asbitemBatchInit = deepCopy(this.asbitemBatch)
   },
 
   //挂载完成
@@ -83,15 +83,25 @@ export default {
 
     //批量调整项目(确定按钮)
     btnOk() {
-      this.$message.warning({showClose:true,message:'开发中.....'})
-      return
+      //this.$message.warning({showClose:true,message:'开发中.....'})
+      //return
 
-      let url = '/api/app/RegisterCheck/UpdateBatchCheckDoctor'
+      let url = '/api/app/PatientRegister/BatchUpdatePatientRegisterInfoByPatientRegisterId'
       //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor'
-      
-      postapi(url, { patientRegisterIds: this.patientRegisterIds, medicalTypeId })
+      /*
+      {
+        "patientRegisterIds": [
+          "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+        ],
+        "medicalTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "personnelTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "remark": "string"
+      }
+      */
+      postapi(url, { patientRegisterIds: this.patientRegisterIds, medicalTypeId:this.medicalTypeId })
         .then(res => {
           if (res.code > -1) {
+            this.$message.success({showClose:true,message:'操作成功！'})
             this.dialogWin.PatientRegisterEditMedicalTypeBatch = false;
           }
         })
@@ -113,7 +123,7 @@ export default {
           this.dict.medicalType = res.data;
         }
       });
-
+      
     },
 
   },
diff --git a/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue b/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue
new file mode 100644
index 0000000..99d4ada
--- /dev/null
+++ b/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <div>      
+      <div style="margin-top: 2px">
+        <el-select v-model="personnelTypeId" placeholder="请选择" filterable clearable style="width:300px;" size="small">
+          <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
+        </el-select>        
+        <div style="margin: 10px; display: flex;justify-content: space-between;">
+          <div></div>
+          <div>
+            <el-button class="commonbutton" type="primary" @click="btnOk">确 定</el-button>          
+            <el-button class="commonbutton" @click="dialogWin.PatientRegisterEditPersonnelTypeTypeBatch = false">取 消</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <!-- 通用进度条 -->
+      <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
+        <ElProgressOCX />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+
+
+import {
+  dddw,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy,
+} from "../../utlis/proFunc";
+
+
+
+import ElProgressOCX from "../report/ElProgressOCX.vue";
+
+export default {
+  components: {
+    ElProgressOCX,
+  },
+  props: ["multipleSelection", "doctorType"],
+  data() {
+    return {
+      tableData: [],
+      users: [],
+      patientRegisterIds: [],
+      personnelTypeId:'',
+    };
+  },
+
+  // 组件创建完成
+  created() {
+    //this.asbitemBatchInit = deepCopy(this.asbitemBatch)
+  },
+
+  //挂载完成
+  mounted() {
+    // 初始化数据，如：在用组合项目
+    this.dictInit()
+  },
+
+  computed: {
+    ...mapState([
+      "window",
+      "dataTransOpts",
+      "dialogWin",
+      "dict",
+      "elProgress",
+      "patientRegister",
+      "customerOrg",
+    ]),
+
+  },
+  methods: {
+    moment, dddw, deepCopy,
+
+
+    //批量调整项目(确定按钮)
+    btnOk() {
+      //this.$message.warning({showClose:true,message:'开发中.....'})
+      //return
+
+      let url = '/api/app/PatientRegister/BatchUpdatePatientRegisterInfoByPatientRegisterId'
+      //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor'
+      /*
+      {
+        "patientRegisterIds": [
+          "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+        ],
+        "medicalTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "personnelTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "remark": "string"
+      }
+      */
+      postapi(url, { patientRegisterIds: this.patientRegisterIds, personnelTypeId:this.personnelTypeId })
+        .then(res => {
+          if (res.code > -1) {
+            this.$message.success({showClose:true,message:'操作成功！'})
+            this.dialogWin.PatientRegisterEditPersonnelTypeBatch = false;
+          }
+        })
+
+    },
+
+    // 初始化字典信息
+    dictInit() {
+
+      this.patientRegisterIds = []
+      this.multipleSelection.forEach(e => {
+        this.patientRegisterIds.push(e.id)
+      });
+
+      // 获取体检类别
+      //体检类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code > -1) {
+          this.dict.personnelType = res.data;
+        }
+      });
+
+    },
+
+  },
+
+  //监听事件
+  watch: {
+    "dataTransOpts.plus.PatientRegisterEditPersonnelTypeBatch": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        //console.log(`watch: 刷新在用组合体检类别 newVal: ${newVal} oldVal:${oldVal}`)
+        if (newVal != oldVal) this.dictInit()
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 5px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 100px;
+}
+</style>
diff --git a/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue b/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue
new file mode 100644
index 0000000..b38f7e5
--- /dev/null
+++ b/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue
@@ -0,0 +1,153 @@
+<template>
+  <div>
+    <div>      
+      <div style="margin-top: 2px">
+        <el-input v-model="remark" type="textarea" :rows="2" placeholder="请输入备注" size="small"></el-input>        
+        <div style="margin: 10px; display: flex;justify-content: space-between;">
+          <div></div>
+          <div>
+            <el-button class="commonbutton" type="primary" @click="btnOk">确 定</el-button>          
+            <el-button class="commonbutton" @click="dialogWin.PatientRegisterEditRemarkBatch = false">取 消</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <!-- 通用进度条 -->
+      <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
+        <ElProgressOCX />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+
+
+import {
+  dddw,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy,
+} from "../../utlis/proFunc";
+
+
+
+import ElProgressOCX from "../report/ElProgressOCX.vue";
+
+export default {
+  components: {
+    ElProgressOCX,
+  },
+  props: ["multipleSelection", "doctorType"],
+  data() {
+    return {
+      tableData: [],
+      users: [],
+      patientRegisterIds: [],
+      remark:'',
+    };
+  },
+
+  // 组件创建完成
+  created() {
+    //this.asbitemBatchInit = deepCopy(this.asbitemBatch)
+  },
+
+  //挂载完成
+  mounted() {
+    // 初始化数据，如：在用组合项目
+    this.dictInit()
+  },
+
+  computed: {
+    ...mapState([
+      "window",
+      "dataTransOpts",
+      "dialogWin",
+      "dict",
+      "elProgress",
+      "patientRegister",
+      "customerOrg",
+    ]),
+
+  },
+  methods: {
+    moment, dddw, deepCopy,
+
+
+    //批量调整项目(确定按钮)
+    btnOk() {
+      //this.$message.warning({showClose:true,message:'开发中.....'})
+      //return
+
+      let url = '/api/app/PatientRegister/BatchUpdatePatientRegisterInfoByPatientRegisterId'
+      //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor'
+      /*
+      {
+        "patientRegisterIds": [
+          "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+        ],
+        "medicalTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "personnelTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        "remark": "string"
+      }
+      */
+      postapi(url, { patientRegisterIds: this.patientRegisterIds, remark:this.remark })
+        .then(res => {
+          if (res.code > -1) {
+            this.$message.success({showClose:true,message:'操作成功！'})
+            this.dialogWin.PatientRegisterEditRemarkBatch = false;
+          }
+        })
+
+    },
+
+    // 初始化字典信息
+    dictInit() {
+
+      this.patientRegisterIds = []
+      this.multipleSelection.forEach(e => {
+        this.patientRegisterIds.push(e.id)
+      });
+     
+
+    },
+
+  },
+
+  //监听事件
+  watch: {
+    "dataTransOpts.plus.PatientRegisterEditRemarkBatch": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        //console.log(`watch: 刷新在用组合体检类别 newVal: ${newVal} oldVal:${oldVal}`)
+        if (newVal != oldVal) this.dictInit()
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 5px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 100px;
+}
+</style>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index c6a0eb5..d517315 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -98,8 +98,8 @@
                     ">
                       {{ scope.row.customerOrgGroupName }}
                     </div>
-
                   </div>
+                  <!--
                   <div v-else-if="dragCol[index].prop == 'nationId'">
                     {{
                       dddw(
@@ -110,6 +110,7 @@
                       )
                     }}
                   </div>
+                  -->
                   <div v-else-if="dragCol[index].prop == 'birthDate'">
                     {{
                       scope.row[dragCol[index].prop]
@@ -119,6 +120,7 @@
                         : ""
                     }}
                   </div>
+                  <!--
                   <div v-else-if="dragCol[index].prop == 'maritalStatusId'">
                     {{
                       dddw(
@@ -129,6 +131,7 @@
                       )
                     }}
                   </div>
+                  -->
                   <div v-else-if="dragCol[index].prop == 'medicalTypeId'">
                     {{
                       dddw(
@@ -139,6 +142,7 @@
                       )
                     }}
                   </div>
+                  <!--
                   <div v-else-if="dragCol[index].prop == 'personnelTypeId'">
                     {{
                       dddw(
@@ -149,6 +153,7 @@
                       )
                     }}
                   </div>
+                  -->
                   <div v-else-if="dragCol[index].prop == 'idNo'">
                     {{ scope.row[dragCol[index].prop] }}&#031;
                   </div>
@@ -391,6 +396,18 @@
         <PatientRegisterEditMedicalTypeBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
+      <!-- 批量调整人员类别 -->
+      <el-dialog title="批量调整人员类别" :visible.sync="dialogWin.PatientRegisterEditPersonnelTypeBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditPersonnelTypeBatch :multipleSelection="multipleSelection" />
+      </el-dialog>
+
+      <!-- 批量调整备注 -->
+      <el-dialog title="批量调整备注" :visible.sync="dialogWin.PatientRegisterEditRemarkBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditRemarkBatch :multipleSelection="multipleSelection" />
+      </el-dialog>
+
       <!-- 通用进度条 -->
       <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
         :close-on-click-modal="false" :append-to-body="true">
@@ -443,6 +460,8 @@ import PatientRegisterEditGroupBatch from "./PatientRegisterEditGroupBatch.vue";
 import PatientRegisterEditItemBatch from "./PatientRegisterEditItemBatch.vue";
 import PatientRegisterEditDoctorBatch from "./PatientRegisterEditDoctorBatch.vue";
 import PatientRegisterEditMedicalTypeBatch from "./PatientRegisterEditMedicalTypeBatch.vue";
+import PatientRegisterEditPersonnelTypeBatch from "./PatientRegisterEditPersonnelTypeBatch.vue";
+import PatientRegisterEditRemarkBatch from "./PatientRegisterEditRemarkBatch.vue";
 import ImportOrgData from "./ImportOrgData.vue";
 import LocalConfig from "../../components/common/LocalConfig.vue";
 import Queue from "../../components/queue/Queue.vue";
@@ -456,6 +475,8 @@ export default {
     PatientRegisterEditItemBatch, // 批量调整项目
     PatientRegisterEditDoctorBatch, // 批量调整检查项目医生
     PatientRegisterEditMedicalTypeBatch, // 批量调整体检类别
+    PatientRegisterEditPersonnelTypeBatch, // 批量调整体检类别
+    PatientRegisterEditRemarkBatch, // 批量调整体检类别
     ElProgressOCX,
     LocalConfig,
     ImportOrgData,
@@ -538,7 +559,7 @@ export default {
           minWidth: 150,
           align: "center",
         },
-        { label: "民族", prop: "nationId", minWidth: 55, align: "center" },
+        { label: "民族", prop: "nationName", minWidth: 55, align: "center" }, //nationId
         { label: "身份证", prop: "idNo", minWidth: 160, align: "center" },
         { label: "出生日期", prop: "birthDate", minWidth: 80, align: "center" },
         { label: "邮箱", prop: "email", minWidth: 150, align: "center" },
@@ -560,7 +581,7 @@ export default {
         { label: "工卡号", prop: "jobCardNo", minWidth: 80, align: "center" },
         {
           label: "婚姻状况",
-          prop: "maritalStatusId",
+          prop: "maritalStatusName", //maritalStatusId
           minWidth: 80,
           align: "center",
         },
@@ -572,7 +593,7 @@ export default {
         },
         {
           label: "人员类别",
-          prop: "personnelTypeId",
+          prop: "personnelTypeName", //personnelTypeId
           minWidth: 80,
           align: "center",
         },
@@ -1860,7 +1881,8 @@ export default {
         });
       if (subMenuPrint.length > 0)
         items.push({ label: "打印条码", children: subMenuPrint });
-
+      
+      //  导入结果合集 ============ start 
       let subMenuImp = [];
       if (
         checkPagePriv(this.pagePriv.privs, "导入检查结果") &&
@@ -1892,14 +1914,18 @@ export default {
             this.importResult("diAn", row);
           },
         });
-      if (subMenuImp.length > 0)
+      if (subMenuImp.length > 0){
         items.push({ label: "导入结果", children: subMenuImp });
-
+      }
+      //  导入结果合集 ============ end   
+      
+      //  批量操作合集 ============ start
+      let batchMenus = []  
       if (
         checkPagePriv(this.pagePriv.privs, "批量更新组合项目明细") &&
         this.multipleSelection.length > 0
       )
-        items.push({
+        batchMenus.push({
           label: "批量更新组合项目明细",
           onClick: () => {
             this.btnItemBatch();
@@ -1909,7 +1935,7 @@ export default {
         checkPagePriv(this.pagePriv.privs, "调整检查项目医生") &&
         this.multipleSelection.length > 0
       )
-        items.push({
+        batchMenus.push({
           label: "调整检查项目医生",
           onClick: () => {
             // this.doctorType = 'check'
@@ -1922,7 +1948,7 @@ export default {
         checkPagePriv(this.pagePriv.privs, "批量调整体检类别") &&
         this.multipleSelection.length > 0
       ) {
-        items.push({
+        batchMenus.push({
           label: "批量调整体检类别",
           onClick: () => {
             // this.doctorType = 'check'
@@ -1931,6 +1957,39 @@ export default {
           },
         });
       }
+
+      if (
+        checkPagePriv(this.pagePriv.privs, "批量调整人员类别") &&
+        this.multipleSelection.length > 0
+      ) {
+        batchMenus.push({
+          label: "批量调整人员类别",
+          onClick: () => {
+            // this.doctorType = 'check'
+            this.dataTransOpts.plus.PatientRegisterEditPersonnelTypeBatch++; //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理
+            this.dialogWin.PatientRegisterEditPersonnelTypeBatch = true;
+          },
+        });
+      }
+
+      if (
+        checkPagePriv(this.pagePriv.privs, "批量调整备注") &&
+        this.multipleSelection.length > 0
+      ) {
+        batchMenus.push({
+          label: "批量调整备注",
+          onClick: () => {
+            // this.doctorType = 'check'
+            this.dataTransOpts.plus.PatientRegisterEditRemarkBatch++; //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理
+            this.dialogWin.PatientRegisterEditRemarkBatch = true;
+          },
+        });
+      }
+      if (batchMenus.length > 0){
+        items.push({ label: "批量操作", children: batchMenus });
+      }
+      //  批量操作合集 ============ end  
+
       if (
         checkPagePriv(this.pagePriv.privs, "查看云胶片二维码")
       )
@@ -2313,16 +2372,16 @@ export default {
         if (e.patientRegisterNo) e.patientRegisterNo = '&' + e.patientRegisterNo
         if (e.patientNo) e.patientNo = '&' + e.patientNo
         if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
-          e.groupPack = dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+          e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
         } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
-          e.groupPack = dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+          e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
         }
-        if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
+        //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
         if (e.idNo) e.idNo = e.idNo + '&'
         if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
-        if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName")
+        //if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName")
         if (e.medicalTypeId) e.medicalTypeId = dddw(this.dict.medicalType, "id", e.medicalTypeId, "displayName")
-        if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName")
+        //if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName")
         if (e.isVip) e.isVip = e.isVip == "Y" ? "是" : "否"
         if (e.isUpload) e.isUpload = e.isUpload == "Y" ? "是" : "否"
         if (e.qztlType) e.qztlType = dddw(this.dict.qztlType, "id", e.qztlType, "displayName")
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index 4ec923f..f97e6b6 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -89,7 +89,6 @@ export default {
     //获取体检单位列表树信息 (Y:查所有单位，N：仅查顶级单位) 
 
     //从性能考滤 默认只查顶级单位  
-
     if (this.cusQuery.haveSunCus == 'Y') {
       this.getCustomerOrgAll()
         .then(res => {
@@ -117,8 +116,24 @@ export default {
         let url = '/api/app/CustomerOrg/GetSimpleByCodeAll'
         if(this.LocalConfig.patientRegister.dispCustomerOrgCode == 'Y'){
           url = "/api/app/customerorg/getbycodeall"
-        }
-        getapi(url)
+          getapi(url)
+          .then((res) => {
+            if (res.code > -1) {
+              let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
+              this.cusQuery.times += 1
+              //console.log('getCustomerOrgAll.treeData', treeData)
+              //console.log('getTreeNode', getTreeNode(treeData, "treeChildren", 'id', '3a1d3736-d7c6-a9fb-c165-675335dc0e9b').treeChildren)
+              this.cusQuery.treeDataAll = treeData
+              resolve(treeData)
+            } else {
+              reject(res.message)
+            }
+          })
+          .catch(err => {
+            reject(err)
+          })
+        }else{
+          postapi(url)
           .then((res) => {
             if (res.code > -1) {
               let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
@@ -134,6 +149,8 @@ export default {
           .catch(err => {
             reject(err)
           })
+        }
+        
       })
     },
 
@@ -256,8 +273,8 @@ export default {
       console.log('filterParentNode', value)
       // if (!value) return true;
       // return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
-      this.customerOrgTreeAll = this.cusQuery.treeDataTop1.filter(e => {
-        return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1
+      this.customerOrgTreeAll = this.cusQuery.treeDataTop1.filter(e => {        
+        return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 
       })
 
     },
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 64c756b..d4c47c6 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -49,8 +49,8 @@
       </div>
       <div class="query">
         <span class="spanClass">性别</span>
-        <el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 50px" size="small">
-          <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+        <el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 50px" size="small" clearable>
+          <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
       </div>
diff --git a/src/store/index.js b/src/store/index.js
index 4320e5a..436d8d5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -528,6 +528,8 @@ export default new Vuex.Store({
                 PatientRegisterEditItemBatch: 0, // 刷新批量调整项目窗口
                 PatientRegisterEditDoctorBatch: 0, // 刷新批量调整项目检查医生窗口
                 PatientRegisterEditMedicalTypeBatch:0, // 刷新批量调整体检类别窗口
+                PatientRegisterEditPersonnelTypeBatch:0,  // 刷新批量调整人员类别窗口
+                PatientRegisterEditRemarkBatch:0,       // 刷新批量调整备注窗口
                 PatientRegisterForChoose: 0, // 体检人员查询窗口  
                 OccDisease: 0, // 职业病
                 WebBooking: 0, // 网上预约
@@ -557,6 +559,8 @@ export default new Vuex.Store({
             PatientRegisterEditGroupBatch: false, //批量调整分组
             PatientRegisterEditDoctorBatch: false, // 批量调整检查项目医生
             PatientRegisterEditMedicalTypeBatch: false,  // 批量调整体检类别
+            PatientRegisterEditPersonnelTypeBatch:false,  // 刷新批量调整人员类别窗口
+            PatientRegisterEditRemarkBatch:false,       // 刷新批量调整备注窗口
             MenuPageSet: false, // 设置角色菜单权限
             LocalConfig: false, // 设置窗口
             AsbChargeRequest: false, // 收费申请
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index bb6f47c..7ab2bb9 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -7,44 +7,21 @@
           <span class="contenttitleBold">组合项目</span>
         </div>
         <div class="seachinput">
-          <el-select
-            v-model="department"
-            placeholder="请选择组合项目"
-            filterable
-            :filter-method="remoteMethodes"
-            default-first-option
-            @change="quckDepartments"
-            clearable
-            size="small"
-          >
-            <el-option
-              v-for="item in quckDepartment"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
-            >
+          <el-select v-model="department" placeholder="请选择组合项目" filterable :filter-method="remoteMethodes"
+            default-first-option @change="quckDepartments" clearable size="small">
+            <el-option v-for="item in quckDepartment" :key="item.id" :label="item.displayName" :value="item.id">
             </el-option>
           </el-select>
         </div>
       </div>
       <div style="display: flex; margin-top: 7px">
-        <div
-          :style="
-            'width: 208px;overflow: scroll;height:' +
-            (window.pageHeight < 600 ? 505 : window.pageHeight - 100) +
-            'px;background-color: #fff; border-radius: 8px'
-          "
-        >
+        <div :style="'width: 208px;overflow: scroll;height:' +
+          (window.pageHeight < 600 ? 505 : window.pageHeight - 100) +
+          'px;background-color: #fff; border-radius: 8px'
+          ">
           <div style="margin-top: 10px">
-            <el-tree
-              :data="itemTypeId"
-              :props="treeprops"
-              @node-click="treeclick"
-              node-key="id"
-              ref="itemType"
-              highlight-current
-              auto-expand-parent
-            >
+            <el-tree :data="itemTypeId" :props="treeprops" @node-click="treeclick" node-key="id" ref="itemType"
+              highlight-current auto-expand-parent>
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <div>
                   <span class="treeicons">
@@ -52,11 +29,8 @@
                         class="el-icon-document-remove"
                         v-if="data.parentId == null"
                       ></i> -->
-                    <img
-                      style="width: 20px; height: 20px; vertical-align: sub"
-                      src="@/assets/images/order.png"
-                      v-if="!data.parentId"
-                    />
+                    <img style="width: 20px; height: 20px; vertical-align: sub" src="@/assets/images/order.png"
+                      v-if="!data.parentId" />
                   </span>
                   <span :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{
                     node.label
@@ -69,39 +43,22 @@
         <div style="display: block">
           <div style="margin-left: 15px; display: flex; flex-direction: column">
             <div style="display: flex; margin-bottom: 15px">
-              <div
-                :style="
-                  'width:' +
-                  (window.pageWidth - 200 - 110 - 50 - 14) +
-                  'px;padding: 15px;background-color: #fff;border-radius: 8px;'
-                "
-              >
-                <el-table
-                  :data="tableData"
-                  style="width: 100%"
-                  row-key="id"
-                  :height="
-                    window.pageHeight < 600
-                      ? 190
-                      : Math.floor((window.pageHeight - 260) / 2)
-                  "
-                  class="el-table__body-wrapper tbody"
-                  @row-click="rowick"
-                  highlight-current-row
-                  :row-style="{ height: '36px' }"
-                  ref="tableData"
-                >
+              <div :style="'width:' +
+                (window.pageWidth - 200 - 110 - 50 - 14) +
+                'px;padding: 15px;background-color: #fff;border-radius: 8px;'
+                ">
+                <el-table :data="tableData" style="width: 100%" row-key="id" :height="window.pageHeight < 600
+                    ? 190
+                    : Math.floor((window.pageHeight - 260) / 2)
+                  " class="el-table__body-wrapper tbody" @row-click="rowick" highlight-current-row
+                  :row-style="{ height: '36px' }" ref="tableData">
                   <el-table-column prop="id" label="编号" width="320">
                   </el-table-column>
                   <el-table-column prop="displayName" label="名称" width="">
                   </el-table-column>
                   <el-table-column prop="price" label="价格" width="">
                   </el-table-column>
-                  <el-table-column
-                    prop="forPregnantFlag"
-                    label="备怀孕禁检"
-                    align="center"
-                  >
+                  <el-table-column prop="forPregnantFlag" label="备怀孕禁检" align="center">
                     <template slot-scope="scope">
                       <div style="font-family: 'Microsoft YaHei'">
                         {{
@@ -115,11 +72,7 @@
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    prop="maritalStatusId"
-                    label="婚姻状况"
-                    align="center"
-                  >
+                  <el-table-column prop="maritalStatusId" label="婚姻状况" align="center">
                     <template slot-scope="scope">
                       <div style="font-family: 'Microsoft YaHei'">
                         {{
@@ -135,49 +88,30 @@
                   </el-table-column>
                   <el-table-column prop="creatorName" label="创建者" width="">
                   </el-table-column>
-                  <el-table-column
-                    prop="lastModifierName"
-                    label="修改者"
-                    width=""
-                  >
+                  <el-table-column prop="lastModifierName" label="修改者" width="">
                   </el-table-column>
-                  <el-table-column
-                    prop="creationTime"
-                    label="创建时间"
-                    width="200"
-                  >
+                  <el-table-column prop="creationTime" label="创建时间" width="200">
                     <template slot-scope="scope">
                       {{ scope.row.creationTime | dateFormat }}
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    prop="lastModificationTime"
-                    label="修改时间"
-                    width="200"
-                  >
+                  <el-table-column prop="lastModificationTime" label="修改时间" width="200">
                     <template slot-scope="scope">
                       {{ scope.row.lastModificationTime | dateFormat }}
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center">
                     <template>
-                      <el-tag
-                        class="move"
-                        style="
+                      <el-tag class="move" style="
                           cursor: move;
                           background-color: rgb(245, 245, 245);
                           border: none;
-                        "
-                        draggable="true"
-                      >
-                        <i
-                          class="el-icon-d-caret"
-                          style="
+                        " draggable="true">
+                        <i class="el-icon-d-caret" style="
                             width: 1rem;
                             height: 1rem;
                             color: rgb(113, 113, 113);
-                          "
-                        ></i>
+                          "></i>
                       </el-tag>
                     </template>
                   </el-table-column>
@@ -186,178 +120,99 @@
             </div>
             <!-- table页 -->
             <div style="display: flex">
-              <div
-                :style="
-                  'width:' +
-                  (window.pageWidth - 200 - 110 - 50 - 14) +
-                  'px;padding: 15px;background-color: #fff;border-radius: 8px;'
-                "
-              >
+              <div :style="'width:' +
+                (window.pageWidth - 200 - 110 - 50 - 14) +
+                'px;padding: 15px;background-color: #fff;border-radius: 8px;'
+                ">
                 <el-tabs v-model="activeName">
                   <el-tab-pane label="项目明细" name="first">
                     <div class="mainbox">
-                      <div
-                        class=""
-                        :style="
-                          'width:' +
-                          Math.floor(
-                            (window.pageWidth - 200 - 110 - 50 - 14 - 130) / 2
-                          ) +
-                          'px;'
-                        "
-                      >
+                      <div class="" :style="'width:' +
+                        Math.floor(
+                          (window.pageWidth - 200 - 110 - 50 - 14 - 130) / 2
+                        ) +
+                        'px;'
+                        ">
                         <div>
-                          <span
-                            style="
+                          <span style="
                               padding: 5px;
                               font-size: 14px;
                               font-weight: 400;
                               color: #232748;
                               font-family: NotoSansSC-Regular;
                               margin-bottom: 10px;
-                            "
-                            >项目类别：</span
-                          >
-                          <el-cascader
-                            v-model="values"
-                            :options="itemTypeId"
-                            ref="example"
-                            popper-class="example"
-                            @change="ischangs"
-                            :props="{
+                            ">项目类别：</span>
+                          <el-cascader v-model="values" :options="itemTypeId" ref="example" popper-class="example"
+                            @change="ischangs" :props="{
                               value: 'id',
                               label: 'displayName',
                               children: 'treeChildren',
                               checkStrictly: true,
                               expandTrigger: 'hover',
-                            }"
-                            size="small"
-                          >
+                            }" size="small">
                           </el-cascader>
                         </div>
-                        <el-table
-                          :data="leftdata"
-                          :height="
-                            window.pageHeight < 600
-                              ? 170
-                              : Math.floor((window.pageHeight - 230) / 2)
-                          "
-                          @row-dblclick="dbClickChoosedAsb"
-                          @selection-change="handleSelectionChange"
-                          @row-click="chooseAsbItem"
-                          highlight-current-row
-                          :row-style="{ height: '28px' }"
-                        >
-                          <el-table-column
-                            type="index"
-                            align="center"
-                            label="序号"
-                          />
-                          <el-table-column
-                            prop="displayName"
-                            label="未选项目"
-                          />
+                        <el-table :data="leftdata" :height="window.pageHeight < 600
+                            ? 170
+                            : Math.floor((window.pageHeight - 230) / 2)
+                          " @row-dblclick="dbClickChoosedAsb" @selection-change="handleSelectionChange"
+                          @row-click="chooseAsbItem" highlight-current-row :row-style="{ height: '28px' }">
+                          <el-table-column type="index" align="center" label="序号" />
+                          <el-table-column prop="displayName" label="未选项目" />
                         </el-table>
                       </div>
                       <div class="Selectbutton">
                         <div style="">
-                          <el-button
-                            @click="addAbs"
-                            style="width: 100px"
-                            class="commonbutton"
-                            >添加<i class="el-icon-caret-right"></i>
+                          <el-button @click="addAbs" style="width: 100px" class="commonbutton">添加<i
+                              class="el-icon-caret-right"></i>
                           </el-button>
                         </div>
                         <div style="margin-top: 18px">
-                          <el-button @click="addall" class="difference"
-                            >全添加<i class="el-icon-caret-right"></i
-                            ><i class="el-icon-caret-right"></i
-                          ></el-button>
+                          <el-button @click="addall" class="difference">全添加<i class="el-icon-caret-right"></i><i
+                              class="el-icon-caret-right"></i></el-button>
                         </div>
                         <div style="margin-top: 18px">
-                          <el-button
-                            @click="delAbs"
-                            style="width: 100px"
-                            class="commonbutton"
-                            >移除<i class="el-icon-caret-left"></i>
+                          <el-button @click="delAbs" style="width: 100px" class="commonbutton">移除<i
+                              class="el-icon-caret-left"></i>
                           </el-button>
                         </div>
                         <div style="margin-top: 18px">
-                          <el-button @click="allclear" class="difference"
-                            >全移除<i class="el-icon-caret-left"></i
-                            ><i class="el-icon-caret-left"></i>
+                          <el-button @click="allclear" class="difference">全移除<i class="el-icon-caret-left"></i><i
+                              class="el-icon-caret-left"></i>
                           </el-button>
                         </div>
                       </div>
-                      <div
-                        class=""
-                        :style="
-                          'width:' +
-                          Math.floor(
-                            (window.pageWidth - 200 - 110 - 50 - 14 - 130) / 2
-                          ) +
-                          'px;'
-                        "
-                      >
+                      <div class="" :style="'width:' +
+                        Math.floor(
+                          (window.pageWidth - 200 - 110 - 50 - 14 - 130) / 2
+                        ) +
+                        'px;'
+                        ">
                         <div>
-                          <span
-                            style="
+                          <span style="
                               padding: 5px;
                               font-size: 14px;
                               font-weight: 400;
                               color: #232748;
                               font-family: NotoSansSC-Regular;
                               margin-bottom: 10px;
-                            "
-                            >搜索选择：</span
-                          >
-                          <el-select
-                            value-key="id"
-                            @change="selectitem"
-                            filterable
-                            v-model="flitvalues"
-                            placeholder="请选择"
-                            :filter-method="remoteMethods"
-                            default-first-option
-                            clearable
-                            ref="quickAsbOCX"
-                            size="small"
-                          >
-                            <el-option
-                              v-for="item in filetelists"
-                              :key="item.id"
-                              :label="item.displayName"
-                              :value="item"
-                            >
+                            ">搜索选择：</span>
+                          <el-select value-key="id" @change="selectitem" filterable v-model="flitvalues"
+                            placeholder="请选择" :filter-method="remoteMethods" default-first-option clearable
+                            ref="quickAsbOCX" size="small">
+                            <el-option v-for="item in filetelists" :key="item.id" :label="item.displayName"
+                              :value="item">
                             </el-option>
                           </el-select>
                         </div>
-                        <el-table
-                          :data="rightdata"
-                          :height="
-                            window.pageHeight < 600
-                              ? 170
-                              : Math.floor((window.pageHeight - 230) / 2)
-                          "
-                          width="100%"
-                          @row-dblclick="removeAbs"
-                          @selection-change="selecteditems"
-                          @row-click="removeAsbItem"
-                          highlight-current-row
-                          :row-style="{ height: '28px' }"
-                          :summary-method="getSummaries"
-                          show-summary
-                          ref="table"
-                        >
-                          <el-table-column
-                            type="index"
-                            align="center"
-                            label="序号"
-                          />
-                          <el-table-column
-                            label="已选项目"
-                            prop="displayName"
-                          />
+                        <el-table :data="rightdata" :height="window.pageHeight < 600
+                            ? 170
+                            : Math.floor((window.pageHeight - 230) / 2)
+                          " width="100%" @row-dblclick="removeAbs" @selection-change="selecteditems"
+                          @row-click="removeAsbItem" highlight-current-row :row-style="{ height: '28px' }"
+                          :summary-method="getSummaries" show-summary ref="table">
+                          <el-table-column type="index" align="center" label="序号" />
+                          <el-table-column label="已选项目" prop="displayName" />
                         </el-table>
                       </div>
                     </div>
@@ -365,91 +220,49 @@
                   <!-- 指引单信息 -->
                   <el-tab-pane label="指引信息" name="second">
                     <div style="display: flex; width: 100%">
-                      <div
-                        :style="
-                          'width:' +
-                          (window.pageWidth - 200 - 110 - 50 - 10 - 110 - 10) +
-                          'px;'
-                        "
-                      >
-                        <el-form
-                          ref="guidanceinformation"
-                          :rules="guidelinesRules"
-                          :model="formdata"
-                        >
-                          <el-table
-                            :data="formdata.guidanceinformationdata"
-                            style="width: 100%"
-                            highlight-current-row
-                            @row-click="guiderow"
-                            :row-class-name="tableRowClassName"
-                            :height="
-                              window.pageHeight < 600
+                      <div :style="'width:' +
+                        (window.pageWidth - 200 - 110 - 50 - 10 - 110 - 10) +
+                        'px;'
+                        ">
+                        <el-form ref="guidanceinformation" :rules="guidelinesRules" :model="formdata">
+                          <el-table :data="formdata.guidanceinformationdata" style="width: 100%" highlight-current-row
+                            @row-click="guiderow" :row-class-name="tableRowClassName" :height="window.pageHeight < 600
                                 ? 215
                                 : Math.floor((window.pageHeight - 174) / 2)
-                            "
-                            ref="guidanceinformationdata"
-                            class="guidelines"
-                            border
-                          >
+                              " ref="guidanceinformationdata" class="guidelines" border>
                             <el-table-column label="体检中心" width="200">
                               <template slot-scope="scope">
-                                <el-form-item
-                                  :prop="
-                                    'guidanceinformationdata.' +
-                                    scope.$index +
-                                    '.medicalCenterId'
-                                  "
-                                  :rules="guidelinesRules.medicalCenterId"
-                                >
-                                  <el-select
-                                    v-model="scope.row.medicalCenterId"
-                                  >
-                                    <el-option
-                                      v-for="item in organizationUnitdata"
-                                      :key="item.id"
-                                      :label="item.displayName"
-                                      :value="item.id"
-                                    />
+                                <el-form-item :prop="'guidanceinformationdata.' +
+                                  scope.$index +
+                                  '.medicalCenterId'
+                                  " :rules="guidelinesRules.medicalCenterId">
+                                  <el-select v-model="scope.row.medicalCenterId">
+                                    <el-option v-for="item in organizationUnitdata" :key="item.id"
+                                      :label="item.displayName" :value="item.id" />
                                   </el-select>
                                 </el-form-item>
                               </template>
                             </el-table-column>
                             <el-table-column label="适用性别" width="200">
                               <template slot-scope="scope">
-                                <el-form-item
-                                  :prop="
-                                    'guidanceinformationdata.' +
-                                    scope.$index +
-                                    '.forSexId'
-                                  "
-                                  :rules="guidelinesRules.forSexId"
-                                >
+                                <el-form-item :prop="'guidanceinformationdata.' +
+                                  scope.$index +
+                                  '.forSexId'
+                                  " :rules="guidelinesRules.forSexId">
                                   <el-select v-model="scope.row.forSexId">
-                                    <el-option
-                                      v-for="item in forsexdata"
-                                      :key="item.id"
-                                      :label="item.displayName"
-                                      :value="item.id"
-                                    />
+                                    <el-option v-for="item in forsexdata" :key="item.id" :label="item.displayName"
+                                      :value="item.id" />
                                   </el-select>
                                 </el-form-item>
                               </template>
                             </el-table-column>
                             <el-table-column label="指引信息">
                               <template slot-scope="scope">
-                                <el-form-item
-                                  :prop="
-                                    'guidanceinformationdata.' +
-                                    scope.$index +
-                                    '.guide'
-                                  "
-                                  :rules="guidelinesRules.guide"
-                                >
-                                  <el-input
-                                    v-model="scope.row.guide"
-                                    required
-                                  />
+                                <el-form-item :prop="'guidanceinformationdata.' +
+                                  scope.$index +
+                                  '.guide'
+                                  " :rules="guidelinesRules.guide">
+                                  <el-input v-model="scope.row.guide" required />
                                 </el-form-item>
                               </template>
                             </el-table-column>
@@ -457,28 +270,13 @@
                         </el-form>
                       </div>
                       <div style="margin-left: 15px">
-                        <el-button
-                          type=""
-                          @click="createabulletbox"
-                          style="margin-top: 50px"
-                          class="commonbutton"
-                          >新增</el-button
-                        >
+                        <el-button type="" @click="createabulletbox" style="margin-top: 50px"
+                          class="commonbutton">新增</el-button>
                         <div style="margin-top: 10px">
-                          <el-button
-                            type=""
-                            @click="deleteguidelines"
-                            class="deleteButton"
-                            >删除</el-button
-                          >
+                          <el-button type="" @click="deleteguidelines" class="deleteButton">删除</el-button>
                         </div>
                         <div style="margin-top: 10px">
-                          <el-button
-                            type=""
-                            @click="saveguidelines"
-                            class="commonbutton"
-                            >保存</el-button
-                          >
+                          <el-button type="" @click="saveguidelines" class="commonbutton">保存</el-button>
                         </div>
                       </div>
                     </div>
@@ -491,208 +289,108 @@
         </div>
         <!-- 按钮区域 -->
         <div style="margin-left: 10px">
-          <el-button type="" @click="addll" class="commonbutton"
-            >新增</el-button
-          >
+          <el-button type="" @click="addll" class="commonbutton">新增</el-button>
           <div style="margin-top: 10px">
-            <el-button type="" @click="editpopup" class="commonbutton"
-              >编辑</el-button
-            >
+            <el-button type="" @click="editpopup" class="commonbutton">编辑</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button type="" @click="deleteid" class="deleteButton"
-              >删除</el-button
-            >
+            <el-button type="" @click="deleteid" class="deleteButton">删除</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button type="" @click="topping" class="commonbutton"
-              >置顶</el-button
-            >
+            <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button type="" @click="setlow" class="commonbutton"
-              >置底</el-button
-            >
+            <el-button type="" @click="setlow" class="commonbutton">置底</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button
-              type=""
-              :disabled="isshow"
-              @click="assertion"
-              class="commonbutton"
-              >排序</el-button
-            >
+            <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton">排序</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button
-              type=""
-              :disabled="isshow"
-              @click="cancellation"
-              class="commonbutton"
-              >取消</el-button
-            >
+            <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton">取消</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button
-              type=""
-              :disabled="isdislob"
-              @click="Onsubmit"
-              class="commonbutton"
-              >确定项目</el-button
-            >
+            <el-button type="" :disabled="isdislob" @click="Onsubmit" class="commonbutton">确定项目</el-button>
           </div>
           <div style="margin-top: 10px">
-            <el-button
-              type=""
-              :disabled="isdislob"
-              @click="projectCancellation"
-              class="commonbutton"
-              >取消项目</el-button
-            >
+            <el-button type="" :disabled="isdislob" @click="projectCancellation" class="commonbutton">取消项目</el-button>
           </div>
         </div>
       </div>
     </div>
     <!-- 新增或者编辑弹框 -->
-    <el-dialog
-      :title="title == 1 ? '新增' : '编辑'"
-      :visible.sync="dialogVisible"
-      width="800px"
-      @close="bindidclose"
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="800px" @close="bindidclose"
+      :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="ruleForm" label-width="70px">
         <el-row>
           <el-col :span="10">
             <el-form-item label="项目编号" prop="">
-              <el-input
-                v-model="form.id"
-                :disabled="true"
-                size="small"
-              ></el-input>
+              <el-input v-model="form.id" :disabled="true" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <el-cascader
-                v-model="form.itemTypeId"
-                :options="itemTypeId"
-                popper-class="example"
-                ref="itemTypeIds"
-                @change="ischangsItemTypeId"
-                :props="{
+              <el-cascader v-model="form.itemTypeId" :options="itemTypeId" popper-class="example" ref="itemTypeIds"
+                @change="ischangsItemTypeId" :props="{
                   value: 'id',
                   label: 'displayName',
                   children: 'treeChildren',
                   checkStrictly: true,
                   expandTrigger: 'hover',
-                }"
-                size="small"
-              >
+                }" size="small">
               </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="名称" prop="displayName">
-              <el-input
-                v-model="form.displayName"
-                ref="refinput"
-                @input="($event) => changeUpdate($event, 'displayName')"
-                size="small"
-              ></el-input>
+              <el-input v-model="form.displayName" ref="refinput"
+                @input="($event) => changeUpdate($event, 'displayName')" size="small"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="简称" prop="">
-              <el-input
-                v-model="form.shortName"
-                @input="($event) => changeUpdate($event, 'shortName')"
-                size="small"
-              ></el-input>
+              <el-input v-model="form.shortName" @input="($event) => changeUpdate($event, 'shortName')"
+                size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="适用性别" prop="">
-              <el-select
-                v-model="form.forSexId"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in forSexId"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.forSexId" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in forSexId" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="婚姻状况">
-              <el-select
-                v-model="form.maritalStatusId"
-                placeholder="请选择"
-                style="width: 100%"
-                size="small"
-              >
-                <el-option
-                  v-for="item in dict.forMaritalStatus"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.maritalStatusId" placeholder="请选择" style="width: 100%" size="small">
+                <el-option v-for="item in dict.forMaritalStatus" :key="item.id" :label="item.displayName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="5">
             <el-form-item label="价格" prop="">
-              <el-input
-                v-model="form.price"
-                type="nember"
-                @input="($event) => changeUpdate($event, 'price')"
-                size="small"
-              ></el-input>
+              <el-input v-model="form.price" type="nember" @input="($event) => changeUpdate($event, 'price')"
+                size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="仪器类别" prop="">
-              <el-select
-                v-model="form.deviceTypeId"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in deviceTypeId"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.deviceTypeId" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in deviceTypeId" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="汇总项目类别"
-              prop="collectItemTypeId"
-              label-width="100px"
-            >
-              <el-select
-                v-model="form.collectItemTypeId"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in collectItemType"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+            <el-form-item label="汇总项目类别" prop="collectItemTypeId" label-width="100px">
+              <el-select v-model="form.collectItemTypeId" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in collectItemType" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -711,11 +409,7 @@
                     >
                     </el-option>
                   </el-select> -->
-              <el-checkbox
-                v-model="form.isItemResultMerger"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isItemResultMerger" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -729,65 +423,36 @@
                     >
                     </el-option>
                   </el-select> -->
-              <el-checkbox
-                v-model="form.isBeforeEat"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isBeforeEat" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
+        </el-row>
           <el-col :span="24">
             <el-form-item label="推荐理由" prop="">
-              <el-input
-                v-model="form.suggestReason"
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 2 }"
-                @input="($event) => changeUpdate($event, 'suggestReason')"
-              />
+              <el-input v-model="form.suggestReason" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
+                @input="($event) => changeUpdate($event, 'suggestReason')" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="临床意义" prop="">
-              <el-input
-                v-model="form.clinicalMeaning"
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 2 }"
-                @input="($event) => changeUpdate($event, 'clinicalMeaning')"
-              />
+              <el-input v-model="form.clinicalMeaning" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
+                @input="($event) => changeUpdate($event, 'clinicalMeaning')" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="警告事项" prop="">
-              <el-input
-                v-model="form.warn"
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 2 }"
-                @input="($event) => changeUpdate($event, 'warn')"
-              />
+              <el-input v-model="form.warn" type="textarea" :autosize="{ minRows: 2, maxRows: 2 }"
+                @input="($event) => changeUpdate($event, 'warn')" />
             </el-form-item>
           </el-col>
           <el-col :span="16">
             <el-form-item label="默认结果" prop="" class="my-el-form-item">
               <!-- <el-input v-model="form.defaultResult"></el-input> -->
               <div style="display: flex; justify-content: center">
-                <el-input
-                  v-model="form.defaultResult"
-                  type="textarea"
-                  :autosize="{ minRows: 1, maxRows: 1 }"
-                  @input="($event) => changeUpdate($event, 'defaultResult')"
-                />
-                <el-select
-                  v-model="form.defaultResult"
-                  style="width: 40px"
-                  class="downText"
-                  @change="quckRusetform"
-                >
-                  <el-option
-                    v-for="item in defaultResult"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  >
+                <el-input v-model="form.defaultResult" type="textarea" :autosize="{ minRows: 1, maxRows: 1 }"
+                  @input="($event) => changeUpdate($event, 'defaultResult')" />
+                <el-select v-model="form.defaultResult" style="width: 40px" class="downText" @change="quckRusetform">
+                  <el-option v-for="item in defaultResult" :key="item.value" :label="item.label" :value="item.label">
                   </el-option>
                 </el-select>
               </div>
@@ -795,107 +460,65 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="备怀孕期间禁检" prop="" label-width="110px">
-              <el-select
-                v-model="form.forPregnantFlag"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in forPregnantFlag"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.forPregnantFlag" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in forPregnantFlag" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        <el-row>
           <el-col :span="4">
             <el-form-item label="启用诊断" prop="">
-              <el-checkbox
-                v-model="form.isDiagnosisFunctionBox"
-                @change="changeBox('isDiagnosisFunction')"
-              />
+              <el-checkbox v-model="form.isDiagnosisFunctionBox" @change="changeBox('isDiagnosisFunction')" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="诊断函数" prop="">
-              <el-input
-                v-model="form.diagnosisFunction"
-                :disabled="disableddiagnosisFunction"
-                size="small"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  v-if="form.isDiagnosisFunctionBox"
-                  @click="
-                    (diagnosisFunctionBox = true),
-                      (diagnosisFunctionText = form.diagnosisFunction)
-                  "
-                  size="small"
-                ></el-button>
+              <el-input v-model="form.diagnosisFunction" :disabled="disableddiagnosisFunction" size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isDiagnosisFunctionBox" @click="
+                  (diagnosisFunctionBox = true),
+                  (diagnosisFunctionText = form.diagnosisFunction)
+                  " size="small"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="函数处理完毕" prop="" label-width="100px">
-              <el-checkbox
-                v-model="form.isContinueProcess"
-                true-label="Y"
-                false-label="N"
-              />
+            <el-form-item label="函数后继续" prop="" label-width="100px">
+              <el-checkbox v-model="form.isContinueProcess" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="候诊时间" prop="">
-              <el-input
-                v-model="form.queueTime"
-                type="nember"
-                @input="($event) => changeUpdate($event, 'queueTime')"
-                size="small"
-              ></el-input>
+              <el-input v-model="form.queueTime" type="nember" @input="($event) => changeUpdate($event, 'queueTime')"
+                size="small"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item label="外检" prop="isOutsend" label-width="100px">
+              <el-checkbox v-model="form.isOutsend" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="4">
             <el-form-item label="启用危急值" prop="" label-width="85px">
-              <el-checkbox
-                v-model="form.isCriticalValueFunction"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isCriticalValueFunction" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="危急值函数" prop="" label-width="85px">
-              <el-input
-                v-model="form.criticalValueFunction"
-                disabled
-                size="small"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  v-if="form.isCriticalValueFunction == 'Y'"
-                  @click="
-                    (dialogCriticalValueFunction = true),
-                      (dialogCriticalValueFunctionText =
-                        form.criticalValueFunction)
-                  "
-                  size="small"
-                ></el-button>
+              <el-input v-model="form.criticalValueFunction" disabled size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isCriticalValueFunction == 'Y'" @click="
+                  (dialogCriticalValueFunction = true),
+                  (dialogCriticalValueFunctionText =
+                    form.criticalValueFunction)
+                  " size="small"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <el-form-item label="体检报告" prop="">
-              <el-checkbox
-                v-model="form.isPictureRotate"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isPictureRotate" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -909,80 +532,44 @@
                     >
                     </el-option>
                   </el-select> -->
-              <el-checkbox
-                v-model="form.isWebAppoint"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isWebAppoint" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="条码模式" prop="">
-              <el-select
-                v-model="form.barcodeMode"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in barcodeMode"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.barcodeMode" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in barcodeMode" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
           <el-col :span="5">
             <el-form-item label="疾病筛查类别" prop="" label-width="100px">
-              <el-select
-                v-model="form.diseaseScreeningTypeId"
-                placeholder="请选择"
-                size="small"
-                @change="quckRusetform"
-              >
-                <el-option
-                  v-for="item in diseaseScreeningType"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="form.diseaseScreeningTypeId" placeholder="请选择" size="small" @change="quckRusetform">
+                <el-option v-for="item in diseaseScreeningType" :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="">
-              <el-checkbox
-                v-model="form.isPrivacy"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isPrivacy" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="3">
             <el-form-item label="启用随访" prop="">
-              <el-checkbox
-                v-model="form.isFollowUpFunction"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isFollowUpFunction" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="随访函数" prop="">
               <el-input v-model="form.followUpFunction" disabled size="small">
-                <el-button
-                  slot="append"
-                  icon="el-icon-more"
-                  v-if="form.isFollowUpFunction == 'Y'"
-                  @click="
-                    (dialogFollowUpFunction = true),
-                      (dialogFollowUpFunctionText = form.followUpFunction)
-                  "
-                  size="small"
-                ></el-button>
+                <el-button slot="append" icon="el-icon-more" v-if="form.isFollowUpFunction == 'Y'" @click="
+                  (dialogFollowUpFunction = true),
+                  (dialogFollowUpFunctionText = form.followUpFunction)
+                  " size="small"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -997,11 +584,7 @@
                     >
                     </el-option>
                   </el-select> -->
-              <el-checkbox
-                v-model="form.isCheck"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isCheck" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -1015,11 +598,7 @@
                     >
                     </el-option>
                   </el-select> -->
-              <el-checkbox
-                v-model="form.isActive"
-                true-label="Y"
-                false-label="N"
-              />
+              <el-checkbox v-model="form.isActive" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -1027,79 +606,41 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="创建者">
-              <el-input
-                v-model="form.creatorName"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input v-model="form.creatorName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="创建时间" style="margin-left: -5%">
-              <el-input
-                :value="form.creationTime | dateFormat"
-                disabled
-                style="width: 90%"
-                size="small"
-              ></el-input>
+              <el-input :value="form.creationTime | dateFormat" disabled style="width: 90%" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="修改者" style="margin-left: -25%">
-              <el-input
-                v-model="form.creatorName"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input v-model="form.creatorName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="修改时间" style="margin-left: -5%">
-              <el-input
-                :value="form.lastModificationTime | dateFormat"
-                disabled
-                style="width: 90%"
-                size="small"
-              ></el-input>
+              <el-input :value="form.lastModificationTime | dateFormat" disabled style="width: 90%"
+                size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="editcancellation" class="difference"
-          >取 消</el-button
-        >
-        <el-button type="primary" @click="addoredit" class="commonbutton"
-          >确 定</el-button
-        >
+        <el-button @click="editcancellation" class="difference">取 消</el-button>
+        <el-button type="primary" @click="addoredit" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
     <!-- 指引信息新增修改弹框 -->
-    <el-dialog
-      :title="guidetitle == 1 ? '指引信息新增' : '指引信息修改'"
-      :visible.sync="guidetitledialogVisible"
-      width="50%"
-    >
+    <el-dialog :title="guidetitle == 1 ? '指引信息新增' : '指引信息修改'" :visible.sync="guidetitledialogVisible" width="50%">
       <el-row>
-        <el-form
-          :model="guideform"
-          :rules="guiderules"
-          ref="ruleForms"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
+        <el-form :model="guideform" :rules="guiderules" ref="ruleForms" label-width="100px" class="demo-ruleForm">
           <el-col :span="12">
             <el-form-item label="体检中心" prop="medicalCenterId">
-              <el-select
-                v-model="guideform.medicalCenterId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in organizationUnitdata"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+              <el-select v-model="guideform.medicalCenterId" placeholder="请选择">
+                <el-option v-for="item in organizationUnitdata" :key="item.id" :label="item.displayName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -1120,22 +661,14 @@
           <el-col :span="12">
             <el-form-item label="适用性别" prop="forSexId">
               <el-select v-model="guideform.forSexId" placeholder="请选择">
-                <el-option
-                  v-for="item in forsexdata"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+                <el-option v-for="item in forsexdata" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="指引内容" prop="guide">
-              <el-input
-                v-model="guideform.guide"
-                placeholder="请输入内容"
-              ></el-input>
+              <el-input v-model="guideform.guide" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
         </el-form>
@@ -1146,113 +679,62 @@
       </span>
     </el-dialog>
     <!-- 诊断函数弹框 -->
-    <el-dialog
-      title="诊断函数设置"
-      :visible.sync="diagnosisFunctionBox"
-      width="50%"
-      :close-on-click-modal="false"
-      fullscreen
-    >
+    <el-dialog title="诊断函数设置" :visible.sync="diagnosisFunctionBox" width="50%" :close-on-click-modal="false" fullscreen>
       <el-form label-width="110px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="诊断函数">
-              <el-input
-                type="textarea"
-                v-model="diagnosisFunctionText"
-                :autosize="{ minRows: 29, maxRows: 29 }"
-              ></el-input>
+              <el-input type="textarea" v-model="diagnosisFunctionText"
+                :autosize="{ minRows: 29, maxRows: 29 }"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button
-          @click="(diagnosisFunctionBox = false), (diagnosisFunctionText = '')"
-          class="difference"
-          >取 消</el-button
-        >
-        <el-button
-          type="primary"
-          @click="OnsubmitDiagnosis"
-          class="commonbutton"
-          >确 定</el-button
-        >
+        <el-button @click="(diagnosisFunctionBox = false), (diagnosisFunctionText = '')" class="difference">取
+          消</el-button>
+        <el-button type="primary" @click="OnsubmitDiagnosis" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
     <!-- 危急值函数弹框 -->
-    <el-dialog
-      title="危急值函数设置"
-      :visible.sync="dialogCriticalValueFunction"
-      width="50%"
-      :close-on-click-modal="false"
-      fullscreen
-    >
+    <el-dialog title="危急值函数设置" :visible.sync="dialogCriticalValueFunction" width="50%" :close-on-click-modal="false"
+      fullscreen>
       <el-form label-width="110px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="危急值函数">
-              <el-input
-                type="textarea"
-                v-model="dialogCriticalValueFunctionText"
-                :autosize="{ minRows: 29, maxRows: 29 }"
-              ></el-input>
+              <el-input type="textarea" v-model="dialogCriticalValueFunctionText"
+                :autosize="{ minRows: 29, maxRows: 29 }"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button
-          @click="
-            (dialogCriticalValueFunction = false),
-              (dialogCriticalValueFunctionText = '')
-          "
-          class="difference"
-          >取 消</el-button
-        >
-        <el-button
-          type="primary"
-          @click="OnsubmitDialogCritical"
-          class="commonbutton"
-          >确 定</el-button
-        >
+        <el-button @click="
+          (dialogCriticalValueFunction = false),
+          (dialogCriticalValueFunctionText = '')
+          " class="difference">取 消</el-button>
+        <el-button type="primary" @click="OnsubmitDialogCritical" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
     <!-- 随访函数弹框 -->
-    <el-dialog
-      title="随访函数设置"
-      :visible.sync="dialogFollowUpFunction"
-      width="50%"
-      :close-on-click-modal="false"
-      fullscreen
-    >
+    <el-dialog title="随访函数设置" :visible.sync="dialogFollowUpFunction" width="50%" :close-on-click-modal="false"
+      fullscreen>
       <el-form label-width="110px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="随访函数">
-              <el-input
-                type="textarea"
-                v-model="dialogFollowUpFunctionText"
-                :autosize="{ minRows: 29, maxRows: 29 }"
-              ></el-input>
+              <el-input type="textarea" v-model="dialogFollowUpFunctionText"
+                :autosize="{ minRows: 29, maxRows: 29 }"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button
-          @click="
-            (dialogFollowUpFunction = false), (dialogFollowUpFunctionText = '')
-          "
-          class="difference"
-          >取 消</el-button
-        >
-        <el-button
-          type="primary"
-          @click="OnsubmitDialogFollowUpFunction"
-          class="commonbutton"
-          >确 定</el-button
-        >
+        <el-button @click="
+          (dialogFollowUpFunction = false), (dialogFollowUpFunctionText = '')
+          " class="difference">取 消</el-button>
+        <el-button type="primary" @click="OnsubmitDialogFollowUpFunction" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -1415,6 +897,7 @@ export default {
         isFollowUpFunction: "N",
         followUpFunction: "",
         isPrivacy: "N",
+        isOutsend: 'N'
       },
       forSexId: [], //性别
       forPregnantFlag: [
@@ -1661,7 +1144,7 @@ export default {
         this.initfiletelists.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
             // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
           ) {
@@ -1678,7 +1161,7 @@ export default {
         this.initprojectid.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
             // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
           ) {
@@ -1751,7 +1234,7 @@ export default {
         this.initTableData.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
             // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
           ) {
@@ -1806,7 +1289,7 @@ export default {
         }
         const targetTop = this.$refs["tableData"].$el
           .querySelectorAll(".el-table__body tr")
-          [index - 1].getBoundingClientRect().top;
+        [index - 1].getBoundingClientRect().top;
         const containerTop = this.$refs["tableData"].$el
           .querySelector(".el-table__body")
           .getBoundingClientRect().top;
@@ -2705,7 +2188,7 @@ export default {
   flex-direction: column;
 }
 
-:deep .el-tree-node > .el-tree-node__children {
+:deep .el-tree-node>.el-tree-node__children {
   overflow: visible;
 }