diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index 3290595..412311d 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -80,7 +80,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="状态" prop="isActive" label-width="56px">
+            <el-form-item label="启用" prop="isActive" label-width="56px">
               <!--
               <el-radio v-model="form.isActive" label="Y">启用</el-radio>
               <el-radio v-model="form.isActive" label="N">停用</el-radio>              
@@ -158,7 +158,7 @@
         <el-button type="success" @click="Onsubmit('form')" class="btnClass">保存</el-button>
       </div>
       <div class="btnList">
-        <el-button type="danger" @click="del" class="btnClass">删除</el-button>
+        <el-button type="danger" @click="del('form')" class="btnClass">删除</el-button>
       </div>
     </div>
   </div>
@@ -290,7 +290,7 @@ export default {
 
     //更新获取单位树节点数据
     getCustomerOrgTree() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         //customerOrgTree = res.data;
         console.log("res.data", res.data);
         this.setData({ key: "customerOrg.customerOrgTree", value: res.data });
@@ -374,13 +374,26 @@ export default {
     },
 
     //删除
-    del() {
-      deletapi(
-        `/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`
-      ).then((res) => {
-        this.$message.success("删除 操作成功");
-        this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
-        this.getCustomerOrgTree();
+    del(formName) {
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        //console.log('{patientRegisterIds}',{patientRegisterIds})
+        return deletapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`);
+      }).then((res) => {
+        if(res.code != -1)  {
+          this.$message.success("删除 操作成功");
+          this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
+          this.$refs[formName].resetFields();
+          this.getCustomerOrgTree();
+        }          
+      }).catch((err) => {
+        this.$message({
+          type: "info",
+          message: "已取消删除",
+        });
       });
     },
   },
diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index 81da892..af1128b 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -1,13 +1,10 @@
 <template>
-  <el-tree    
-    :data="customerOrg.customerOrgTree"
-    :props="customerOrg.treeprops"
-    @node-click="treeclick"/>
+  <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick" />
 </template>
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate,deepCopy} from "../../utlis/proFunc";
+import { tcdate, deepCopy } from "../../utlis/proFunc";
 export default {
   components: {},
   data() {
@@ -15,10 +12,10 @@ export default {
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["customerOrg","window"]),
+    ...mapState(["customerOrg", "window"]),
   },
   //创建组件后
-  created() {},
+  created() { },
 
   //挂载组件完成
   mounted() {
@@ -28,7 +25,7 @@ export default {
 
   methods: {
     ...mapMutations(["setData"]),
-    
+
     //获取体检单位列表树信息
     getCustomerOrgTree() {
       //let customerOrgTree = []
@@ -46,67 +43,75 @@ export default {
       // ];
       //console.log('getCustomerOrgTree start')
       // api/app/organization-units/organization-unit-by-is-peis    // api/app/customer-org/by-code-all
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall?IsHidePerson=1").then((res) => {
         //customerOrgTree = res.data;
-        console.log("res.data", res.data);
-        this.setData({ key: "customerOrg.customerOrgTree", value: res.data });
-        tcdate(this.customerOrg.customerOrgTree);
+        if(res.code != -1){
+          this.setData({ key: "customerOrg.customerOrgTree", value: res.data });
+          tcdate(this.customerOrg.customerOrgTree);
+        }
       });
     },
 
     //获取单位基本信息
     getCustomerOrgRd(id) {
-      this.customerOrg.customerOrgRd.id = id;      
+      this.customerOrg.customerOrgRd.id = id;
     },
 
     //获取体检次数列表
     getCustomerOrgRegisterList(customerOrgId) {
+      //api/app/customer-org-register/in-customer-org-id/
       getapi(
-        `/api/app/customer-org-register/in-customer-org-id/${customerOrgId}`
+        `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgId}`
       ).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.customerOrgRegisterList = res.data;
+        if(res.code != -1){
+          this.customerOrg.customerOrgRegisterList = res.data;
+        }
       });
     },
 
+    
+
     //获取联系人列表
     getContactPersonList(customerOrgId) {
-      getapi(
-        `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
-      ).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.contactPersonList = res.data;
+    getapi(
+      `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
+    ).then((res) => {
+      if(res.code != -1){
+        this.customerOrg.contactPersonList = res.data;      
         if (res.data.length > 0) {
           this.getContactMethodList(res.data[0].id);
         } else {
           this.customerOrg.contactMethodList = [];
         }
-      });
-    },
+      }
+    });
+  },
 
-    //获取联系方式列表
-    //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
-    getContactMethodList(ContactPersonId) {
-      getapi("/api/app/contact-method/in-contact-person-id", {
-        ContactPersonId,
-      }).then((res) => {
-        //console.log('res.data',res.data)
+  //获取联系方式列表
+  //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
+  getContactMethodList(ContactPersonId) {
+    getapi("/api/app/contact-method/in-contact-person-id", {
+      ContactPersonId,
+    }).then((res) => {
+      if(res.code != -1){
         this.customerOrg.contactMethodList = res.data;
-      });
-    },
+      }
+    });
+  },
 
-    //点击树节点
-    treeclick(data) {
-      //this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//   api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
-      this.customerOrg.customerOrgId = data.id;
-      this.getCustomerOrgRd(data.id);
+  //点击树节点
+  treeclick(data) {
+    //this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//   api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
+    this.customerOrg.customerOrgId = data.id;
+    this.getCustomerOrgRd(data.id);
+    //只有单位才有体检次数登记，部门无
+    if(!data.parentId){
       this.getCustomerOrgRegisterList(data.id);
-      this.getContactPersonList(data.id);
-    },
+    }
+    this.getContactPersonList(data.id);
   },
+},
  
 };
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index ff89f32..97bdbfe 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -30,7 +30,7 @@ export default {
   methods: {
     //获取体检单位列表树信息
     getCustomerOrgTree() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         //customerOrgTree = res.data;
         console.log("res.data", res.data);
         this.patientRegister.customerOrgTreeAll = res.data;
diff --git a/src/components/patientRegisterSign/customerOrgEdit.vue b/src/components/patientRegisterSign/customerOrgEdit.vue
index 64c5bc2..2b87d37 100644
--- a/src/components/patientRegisterSign/customerOrgEdit.vue
+++ b/src/components/patientRegisterSign/customerOrgEdit.vue
@@ -299,7 +299,7 @@ export default {
 
     //更新获取单位树节点数据
     getCustomerOrgTree() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         //customerOrgTree = res.data;
         console.log("res.data", res.data);
         this.setData({ key: "customerOrg.customerOrgTree", value: res.data });
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index ff89f32..cd1e27d 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -1,25 +1,117 @@
 <template>
-  <el-tree
-    :data="patientRegister.customerOrgTreeAll"
-    :props="customerOrg.treeprops"
-    @node-click="treeclick"
-  ></el-tree>
+  <div style="display: flex;">
+    <div style="width: 180px;height:500px;margin-top: -30px;overflow: scroll;border: 1px solid;">
+      <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" @node-click="handleNode" />
+    </div>
+    <div style="display: block;width:620px;margin-top: -30px; margin-left: 5px;">
+      <el-table :data="dataCusOrgOCX" border height="450" highlight-current-row @row-click="rowick" size="small"
+        @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick">
+        <el-table-column prop="customerOrgId" label="体检单位" width="130">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerOrgId" placeholder="体检单位" style="width: 60px" size="small"
+              value-key="id">
+              <el-option v-for="item in patientRegister.customerOrgTreeAll" :key="item.id" :label="item.displayName"
+                :value="item.id" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgId" label="次数" width="45" align="center">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerOrgRegister" placeholder="次数" style="width: 60px" size="small"
+              :disabled="scope.row.customerOrgId == dict.personOrgId"
+              @change="changeMedicalTimes(scope.row.customerOrgId)" value-key="id">
+              <el-option v-for="item in customerOrg.customerOrgRegisterList" :key="item.id" :label="item.medicalTimes"
+                :value="item" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="dateType" label="日期方式" width="80" align="center">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.dateType" placeholder="请选择" filterable clearable size="small">
+              <el-option label="登记日期" value="creationTime" />
+              <el-option label="体检日期" value="medicalStartDate" />
+              <el-option label="总检日期" value="summaryDate" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startDate" label="起始日期" width="100" align="center">
+          <template slot-scope="scope">
+            <el-date-picker v-model="scope.row.startDate" type="date" placeholder="截止日期" size="small" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="endDate" label="截止日期" width="100" align="center">
+          <template slot-scope="scope">
+            <el-date-picker v-model="scope.row.endDate" type="date" placeholder="截止日期" size="small" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgGroupIds" label="分组" width="160">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerOrgGroupIds" multiple collapse-tags filterable clearable
+              placeholder="请选择分组" size="small">
+              <el-option v-for="item in dict.asbItemAll" :key="item.value" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="display: flex;margin-top: 8px;margin-left: 15px;">
+        <div style="display: block;">
+          <div>
+            <span>日期方式：</span>
+            <el-radio-group v-model="dateType">
+              <el-radio label="creationTime">登记日期</el-radio>
+              <el-radio label="medicalStartDate">体检日期</el-radio>
+              <el-radio label="summaryDate">总检日期 </el-radio>
+            </el-radio-group>
+          </div>
+          <div style="margin-top: 5px;">
+            <span>单位作为查询条件：</span>
+            <el-checkbox v-model="useCusOrg" />
+          </div>
+        </div>
+        <div style="margin-left: 50px;margin-top: 5px;">
+          <el-button type="primary" @click="readIdCard">确定</el-button>
+          <el-button type="danger" @click="report.dialogCusOrgOCX = false">关闭</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate } from "../../utlis/proFunc";
+import { getTreePids, getTreeAllChildIdsById } from "../../utlis/tree";
 export default {
   components: {},
   data() {
-    return {};
+    return {
+      preNodeId: '',  //上一次点击树节点
+      curNodeId: '',  //本次点击树节点 
+      parentIds: [],   //上级Id 数组
+      childIds: [],    //下级Id 数组  
+      dateType: 'creationTime',
+      useCusOrg: true,   //是否使用单位
+      //体检单位，体检次数，日期类型，起止日期，分组
+      dataCusOrgOCX: [{
+        customerOrgId: '',
+        customerOrgRegister: '',     //已选的体检次数
+        customerOrgRegisterList: [], //当前单位的体检次数信息
+        dateType: 'creationTime',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
+        startDate: '',
+        endDate: '',
+        customerOrgGroupIds: [],  //已选的体检次数
+        customerOrgGroupList: [],  //已选的分组
+      }],
+    };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["dict", "customerOrg", "patientRegister"]),
+    ...mapState(["dict", "customerOrg", "patientRegister", "report"]),
   },
   //创建组件后
-  created() {},
+  created() {
+    this.dataCusOrgOCX = this.report.dataCusOrgOCX;
+  },
 
   //挂载组件完成
   mounted() {
@@ -30,7 +122,7 @@ export default {
   methods: {
     //获取体检单位列表树信息
     getCustomerOrgTree() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         //customerOrgTree = res.data;
         console.log("res.data", res.data);
         this.patientRegister.customerOrgTreeAll = res.data;
@@ -58,6 +150,97 @@ export default {
       this.getCustomerOrgParentId(data.id);
       this.patientRegister.query.times++; //用于触发查询条件
     },
+
+    //树控件--伪双击事件
+    handleNode(data, node, prop) {
+      console.log(data, node, prop);
+      if (!this.preNodeId) {
+        this.preNodeId = data.id;
+      } else {
+        this.curNodeId = data.id;
+      }
+      //双击事件
+      if (this.preNodeId == this.curNodeId) { //第一次点击的节点和第二次点击的节点id相同
+        this.preNodeId = null;
+        this.curNodeId = null;
+        this.treeDbClick(data.id);
+        return;
+      }
+
+      this.nodeTimer = setTimeout(() => { //300ms内没有第二次点击就把第一次点击的清空
+        this.preNodeId = null;
+      }, 300)
+    },
+
+    async treeDbClick(cusOrgId) {
+      this.parentIds = getTreePids(this.patientRegister.customerOrgTreeAll, 'children', 'parentId', 'id', cusOrgId);
+      this.childIds = getTreeAllChildIdsById(this.patientRegister.customerOrgTreeAll, 'children', 'id', cusOrgId);
+
+      //待添加的记录
+      let ldate = new Date();
+      let record = {
+        customerOrgId: '',
+        customerOrgRegister: {},     //已选的体检次数
+        customerOrgRegisterList: [], //当前单位的体检次数信息
+        dateType: 'creationTime',  // 登记日期：creationTime；体检日期：medicalStartDate；总检日期：summaryDate
+        startDate: ldate,
+        endDate: ldate,
+        customerOrgGroupIds: [],  //已选的体检分组
+        customerOrgGroupList: [],  //可选的分组
+      }
+      record.customerOrgId = cusOrgId;
+      if(cusOrgId != this.dict.personOrgId){      
+        try {
+          //
+          let res1 = await getapi(`/api/app/customer-org-register/in-customer-org-id/${cusOrgId}`);
+          record.customerOrgRegisterList = res1.data;
+          if(res1.data && res1.data.length > 0){
+            record.customerOrgRegister = res1.data[res1.data.length - 1];
+            record.startDate = res1.data[res1.data.length - 1].beginTime;
+            record.endDate = res1.data[res1.data.length - 1].isComplete == 'N' ? ldate : res1.data[res1.data.length - 1].endTime;
+          }
+        } catch (error) {
+          console.log(`get: /api/app/customer-org-register/in-customer-org-id/${cusOrgId}`,error)
+        }
+
+
+
+
+      }
+
+
+    },
+
+    //选择单位
+    changeCustomerOrgId(v) {
+      console.log(v)
+      if (!v) {
+        this.patientRegister.query.customerOrgRegister = null;
+        return;
+      }
+
+      let customerOrgId = v[0];
+      if (customerOrgId == this.dict.personOrgId) {
+        this.patientRegister.query.customerOrgRegister = null;
+        return;
+      }
+      getapi(
+        `/api/app/customer-org-register/in-customer-org-id/${customerOrgId}`
+      ).then((res) => {
+        //console.log('res.data',res.data)
+        if (res.code != -1) {
+          this.customerOrg.customerOrgRegisterList = res.data;
+          if (res.data.length > 0) {
+            this.patientRegister.query.customerOrgRegister = res.data[res.data.length - 1];
+            this.patientRegister.query.dateRange = [
+              res.data[res.data.length - 1].beginTime,
+              res.data[res.data.length - 1].isComplete == 'N' ? new Date() : res.data[res.data.length - 1].endTime
+            ]
+          }
+        }
+      });
+    },
+
   },
 };
 </script>
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index 579b25e..6d97977 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -65,7 +65,7 @@
     </div>
     <!--通用选单位、体检次数、分组的控件-->
     <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
-      :close-on-click-modal="false" width="800px" height="600px">
+      :close-on-click-modal="false" width="840px" height="600px">
       <CusOrgOCX/>
     </el-dialog>
   </div>
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 28c8299..78c8c5e 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -176,3 +176,38 @@ exports.birthdayToAge = function (birthday)  {
   return Math.floor((new Date().getTime() - new Date(birthday).getTime())/yearInMs) 
 }
 
+//通过ID值，找出所有父节点值
+function getTreeParents(tree,nodeName,parentIdName,idName,idVal,parentIds){
+  for(let i=0;i<tree.length;i++){
+    parentIds = [];
+    if(tree[i][idName] == idVal){
+      break;
+    }else{
+      parentIds.push(tree[i][idName]);
+      getTreeParents(tree[i][nodeName],nodeName,parentIdName,idName,idVal,parentIds);
+    }
+  }
+}
+exports.getTreeParents = getTreeParents;
+
+//通过ID值，找出所有子节点值
+function getTreeAllChilds(tree,nodeName,idName,childIds){
+  tree.forEach(e =>{
+    childIds.push(e[idName]);
+    getTreeAllChilds(e[nodeName],nodeName,idName,childIds);
+  });
+  return nodeIds;
+}
+function getTreeChilds(tree,nodeName,parentIdName,idName,idVal){
+  for(let i=0;i<tree.length;i++){
+    let childIds = [];
+    if(tree[i][idName] == idVal){
+
+      break;
+    }else{
+      getTreeParents(tree[i][nodeName],nodeName,parentIdName,idName,idVal);
+    }
+  }
+}
+exports.getTreeChilds = getTreeChilds;
+
diff --git a/src/utlis/tree.js b/src/utlis/tree.js
new file mode 100644
index 0000000..a286ee0
--- /dev/null
+++ b/src/utlis/tree.js
@@ -0,0 +1,113 @@
+//树对象相关操作 目前只支持单主键操作
+
+//将list数据，生成tree
+function madeTree(dataSource, childNodeName, pidName, idName, pidVal) {
+    if (!dataSource || dataSource.length < 1) return [];
+    let trees = []
+    let lchildNodeName = childNodeName || 'children';
+    let lpidName = pidName || 'pid';
+    let lidName = idName || 'id';
+ 
+    dataSource.forEach(e => {
+       let tree = {}, ret = null;
+       if (pidVal) {  //根节点有具体的值
+          if (e[lpidName] == pidVal) {
+             tree = e;
+             ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
+             if (ret && ret.length > 0) tree[lchildNodeName] = ret;
+             trees.push(tree);
+          }
+       } else {
+          if (!e[lpidName]) {  //根节点为0,空或null
+             tree = e;
+             ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
+             if (ret && ret.length > 0) tree[lchildNodeName] = ret;
+             trees.push(tree);
+          }
+       }
+    })
+    return trees;
+ }
+ 
+ //通过ID值，找出所有父节点值
+ function getTreePids(tree, childNodeName, pidName, idName, idVal) {
+    let pids = [],treeNode = null;
+    if (!tree || tree.length < 1) return [];
+    if (!idVal) return [];
+    let lchildNodeName = childNodeName || 'children';
+    let lpidName = pidName || 'pid';
+    let lidName = idName || 'id';
+ 
+    treeNode = getTreeNode(tree,lchildNodeName,lidName, idVal);  
+    //console.log('treeNode',treeNode); 
+    if(treeNode){      
+       pids.push(treeNode[lpidName]);      
+       getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]).forEach(e =>{
+          pids.push(e);
+       });      
+    }
+ 
+    return pids;   
+ }
+ 
+ 
+ //通过ID值，找出所有子节点值
+ function getTreeAllChildIdsByNode(treeNode, childNodeName, idName) {
+    let childIds = [];
+    let lchildNodeName = childNodeName || 'children';
+    let lidName = idName || 'id';
+ 
+    if (!treeNode) return [];
+    if (!treeNode[lchildNodeName] || treeNode[lchildNodeName].length < 1) return [];
+ 
+    treeNode[lchildNodeName].forEach(e => {
+       childIds.push(e[lidName]);
+       getTreeAllChildIdsByNode(e, lchildNodeName, lidName).forEach(e2 =>{
+          childIds.push(e2);
+       });
+    });
+    return childIds;
+ }
+ 
+ //通过ID值，找出所有子节点值
+ function getTreeAllChildIdsById(tree, childNodeName, idName, idVal) {
+    let childIds = [], treeNode = null;
+    let lchildNodeName = childNodeName || 'children';
+    let lidName = idName || 'id';
+ 
+    if (!tree || tree.length < 1) return [];
+    treeNode = getTreeNode(tree, lchildNodeName, lidName, idVal);
+    childIds = getTreeAllChildIdsByNode(treeNode, lchildNodeName, lidName);
+ 
+    return childIds;
+ }
+ 
+ //获取节点本身
+ function getTreeNode(tree, childNodeName, idName, idVal) {
+    let treeNode = null;
+    let lchildNodeName = childNodeName || 'children';
+    let lidName = idName || 'id';
+ 
+    if (!tree || tree.length < 1) return treeNode;
+ 
+    for (let i = 0; i < tree.length; i++) {
+       if (tree[i][lidName] == idVal) {
+          treeNode = tree[i];
+          break;
+       } else {
+          if (tree[i][lchildNodeName] && tree[i][lchildNodeName].length > 0) {
+             treeNode = getTreeNode(tree[i][lchildNodeName], lchildNodeName, lidName, idVal);
+          }
+          if (treeNode) break;
+       }
+    }
+    return treeNode;
+ }
+ 
+ 
+ module.exports = {
+    madeTree,
+    getTreePids, getTreeAllChildIdsByNode,getTreeAllChildIdsById, getTreeNode,
+ }
+ 
+ 
\ No newline at end of file
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 45355c2..8938650 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -946,7 +946,7 @@ export default {
       });
 
       //体检单位
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.patientRegister.customerOrgTreeAll = res.data;
         tcdate(this.patientRegister.customerOrgTreeAll)
       });
diff --git a/src/views/checkStatus/index.vue b/src/views/checkStatus/index.vue
index 25cc91a..2801249 100644
--- a/src/views/checkStatus/index.vue
+++ b/src/views/checkStatus/index.vue
@@ -109,7 +109,7 @@ export default {
       );
 
       //体检单位树
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         if (res.code == 1) {
           this.patientRegister.customerOrgTreeAll = res.data;
           tcdate(this.patientRegister.customerOrgTreeAll);
diff --git a/src/views/customerOrg/patientRegisterRefuse.vue b/src/views/customerOrg/patientRegisterRefuse.vue
index a465f8c..8471993 100644
--- a/src/views/customerOrg/patientRegisterRefuse.vue
+++ b/src/views/customerOrg/patientRegisterRefuse.vue
@@ -62,7 +62,7 @@ export default {
       });    
       
       //体检单位
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.patientRegister.customerOrgTreeAll = res.data;
         tcdate(this.patientRegister.customerOrgTreeAll)
       });
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index effafa5..3725ccb 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -177,7 +177,7 @@ export default {
       });
 
       //获取体检单位列表树信息   
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         //customerOrgTree = res.data;
         console.log("res.data", res.data);
         this.patientRegister.customerOrgTreeAll = res.data;
diff --git a/src/views/doctorCheck/personnelBatch.vue b/src/views/doctorCheck/personnelBatch.vue
index f3b0691..5c89e7d 100644
--- a/src/views/doctorCheck/personnelBatch.vue
+++ b/src/views/doctorCheck/personnelBatch.vue
@@ -400,7 +400,7 @@ export default {
 
     slicetdata() {
       console.log("2");
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.gettypelist(res.data);
         this.departmentdata = res.data;
         console.log(res);
diff --git a/src/views/doctorCheck/positiveresults.vue b/src/views/doctorCheck/positiveresults.vue
index 0fed112..64a5f5a 100644
--- a/src/views/doctorCheck/positiveresults.vue
+++ b/src/views/doctorCheck/positiveresults.vue
@@ -210,18 +210,18 @@ export default {
     close() {
       this.visible = false;
     },
-    // /api/app/customer-org/by-code-all
+    // /api/app/customerorg/getbycodeall
     unitchang() {
       console.log("1");
       this.visible = true;
       console.log(this.visible);
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.customerorgdata = res.data;
       });
     },
     //获取单位
     obtainingunits() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.customerorgdata = res.data;
       });
     },
diff --git a/src/views/doctorCheck/unitphysicalexamination.vue b/src/views/doctorCheck/unitphysicalexamination.vue
index a634bb6..74c6038 100644
--- a/src/views/doctorCheck/unitphysicalexamination.vue
+++ b/src/views/doctorCheck/unitphysicalexamination.vue
@@ -112,7 +112,7 @@ export default {
   methods: {
     //获取单位
     obtainingunits() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.customerorgdata = res.data;
       });
     },
diff --git a/src/views/fee-settings/diseaseStatistics.vue b/src/views/fee-settings/diseaseStatistics.vue
index aa17ad4..ce14cf6 100644
--- a/src/views/fee-settings/diseaseStatistics.vue
+++ b/src/views/fee-settings/diseaseStatistics.vue
@@ -197,18 +197,18 @@ export default {
     close() {
       this.visible = false;
     },
-    // /api/app/customer-org/by-code-all
+    // /api/app/customerorg/getbycodeall
     unitchang() {
       console.log("1");
       this.visible = true;
       console.log(this.visible);
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.customerorgdata = res.data;
       });
     },
     //获取单位
     obtainingunits() {
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         this.customerorgdata = res.data;
       });
     },
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
index 4d4bc51..e13ecd0 100644
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@@ -81,7 +81,7 @@ export default {
       );
 
       //体检单位树
-      getapi("/api/app/customer-org/by-code-all").then((res) => {
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         if (res.code == 1) {
           this.patientRegister.customerOrgTreeAll = res.data;
           tcdate(this.patientRegister.customerOrgTreeAll);