From 1532f84980a85783f2f81a3b051e880a05e751c9 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Fri, 17 Nov 2023 16:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=97=85=E5=8E=86=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=B9=B6=E6=8F=90=E5=8F=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=91=E5=92=8C=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E5=88=B0?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/dao/Archive_DetailMapper.java     |   2 +-
 .../ipml/Archive_DetailServiceImpl.java       |   2 +-
 .../resources/mapper/Archive_DetailMapper.xml |   2 +-
 .../views/beHospitaledDir/beHospList.jsp      | 424 +---------------
 .../WEB-INF/views/commitDir/commitList.jsp    | 462 +----------------
 .../views/followDir/followUpStatistics.jsp    | 456 +----------------
 .../webapp/WEB-INF/views/font/collection.jsp  | 466 +-----------------
 .../views/inHospitalDir/inHositalList.jsp     | 435 +---------------
 .../views/lastVerifyDir/lastVerifyList.jsp    | 431 +---------------
 .../medicalHandlerDir/medicalHandlerList.jsp  | 435 +---------------
 src/main/webapp/WEB-INF/views/reloadWz.jsp    | 198 +-------
 .../WEB-INF/views/signListDir/signList.jsp    | 420 +---------------
 .../unfileMedicalDir/unfileMedicalList.jsp    | 417 +---------------
 .../static/js/loadAssortDetailCommom.js       | 418 ++++++++++++++++
 14 files changed, 451 insertions(+), 4117 deletions(-)
 create mode 100644 src/main/webapp/static/js/loadAssortDetailCommom.js

diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java
index b73ae376..17e24057 100644
--- a/src/main/java/com/emr/dao/Archive_DetailMapper.java
+++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java
@@ -181,7 +181,7 @@ public interface Archive_DetailMapper {
      */
     List<Archive_Detail> selectPdfPathMayError(Archive_Detail_Vo record);
 
-    Integer selectChildByCloCount(@Param("mIds") String mIds);
+    Integer selectChildByCloCount(@Param("mIds") String mIds,@Param("flag")String flag);
 
     List<String> getPdfUrlByMasterOrId(@Param("assortIds") String[] assortIds, @Param("masterId")String masterId, @Param("flag")String flag, @Param("fileIds")String fileIds);
 
diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
index 19146f7d..4950923f 100644
--- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
@@ -52,7 +52,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
         String mIdStr = getChildMidsByMasterId(masterId);
         if(StringUtils.isNotBlank(mIdStr)) {
             try {
-                Integer count = archiveDetailMapper.selectChildByCloCount(mIdStr);
+                Integer count = archiveDetailMapper.selectChildByCloCount(mIdStr,record.getFlag());
                 return count;
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index 5e92ab2e..afcff79c 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -715,7 +715,7 @@
       and f.id=#{patientId,jdbcType=VARCHAR}
   </select>
   <select id="selectChildByCloCount" resultType="java.lang.Integer">
-    select count(1) from Archive_Detail where MasterID in (${mIds}) and flag = '0'
+    select count(1) from Archive_Detail where MasterID in (${mIds}) and flag = #{flag}
   </select>
   <select id="getPdfUrlByMasterOrId" resultType="java.lang.String">
     SELECT
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index d4efb83d..a2c58956 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -1,5 +1,4 @@
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
 <%
@@ -18,6 +17,7 @@
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
     <%--<link rel="stylesheet" href="${path}/static/css/bootstrap-table-fixed-columns.css"/>--%>
     <%--<script src="${path}/static/js/bootstrap-table-fixed-columns.js"></script>--%>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -4698,322 +4698,17 @@
     }
 
     var idArr = [];
-    var flag = 0;
     var scollPostion2 = null;
-
-    function initTable2() {
-        // idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-
-                var currPageSize = this.pageSize;
-                /* if (currPageSize == 2) {
-                     currPageSize = 10;
-                 }*/
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source = null;
-                if ($("#sourceSearch").val() != null) {
-                    source = $("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        // var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                        // if (row.flag == "0") {
-                        //     html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                        // }
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-                        if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-                        }
-
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                    $("#idPdfT").val(data.id);
-                                }
-                            });
-                            $("#inpId").val(detailId);
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var detailId = row.id;
-                            $("#pdfId").val(row.id);
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                async: false,
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#pathPdf").val(data.pdfPath);
-                                }
-                            });
-                            var titleName = document.getElementById("nameLab").innerText;
-                            var iframeUrl = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url="+detailId+"?titleName=" + titleName);
-                            $('#pdf_page').attr('src', iframeUrl);
-                            //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            // //同步
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-                //idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                //console.info("加载数据失败");
-                //toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if (idArr.indexOf(row.id) == -1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if (idArr.indexOf(row.id) == -1) {
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
-
+    var flag = 0;
     $("#flag").click(function () {
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -5109,115 +4804,6 @@
 
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        // $("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                //toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $('#table2').bootstrapTable('uncheckAll');
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                idArr = [];
-            }
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
-
     $(document).keydown(function (event) {
         if (event.keyCode == 13) {
             searchNode();
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index f5f5205d..e101ef40 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -17,6 +17,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <%@include file="../../jspf/ztreeCommom.jsp" %>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -3999,364 +4000,16 @@
     var idArr = [];
     var flag = 0;
     var scollPostion2 = null;
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                if (currPageSize == 2) {
-                    currPageSize = 10;
-                }
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        //cmtDoctorDate  cmtNurseDate  createTime  uploaddatetime
-                        if (row.archivestate == "提交") {
-                            //判断是否更新
-                            if (row.cmtDoctorDate != null && row.cmtNurseDate != null && row.createTime != null && row.uploaddatetime != null && row.cmtDoctorDate != "" && row.cmtNurseDate != "" && row.createTime != "" && row.uploaddatetime != "") {
-
-                                var maxCmtTime = row.cmtDoctorDate > row.cmtNurseDate ? row.cmtDoctorDate : row.cmtNurseDate;
-                                //后提交那一个,uploaddatetime在主任退回时间和再次 提交之间的时间  就是更新的
-                                //判断日期
-                                if (maxCmtTime >= row.createTime) {
-                                    //row.dischargeDateTime.split(" ")[0]
-                                    var bol = nowInDateBetwen(row.createTime, maxCmtTime, row.uploaddatetime);
-                                    if (bol) {
-                                        //类型节点红色
-                                        //找到节点对象
-                                        var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id
-                                        //var nodeList = zTree.getNodesByParamFuzzy("name", value);
-                                        var node = zTree.getNodesByParam("id", row.assortId, null)[0];
-                                        if (node != null) {
-                                            //找到span标签，并改变颜色
-                                            $("#" + node.tId + "_span").css("color", 'red');
-                                        }
-                                    }
-                                } else {
-                                    var bol = nowInDateBetwen(maxCmtTime, row.createTime, row.uploaddatetime);
-                                    if (bol) {
-                                        //类型节点红色
-                                        //找到节点对象
-                                        var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id
-                                        //var nodeList = zTree.getNodesByParamFuzzy("name", value);
-                                        var node = zTree.getNodesByParam("id", row.assortId, null)[0];
-                                        if (node != null) {
-                                            //找到span标签，并改变颜色
-                                            $("#" + node.tId + "_span").css("color", 'red');
-                                        }
-                                    }
-                                }
-
-                            }
-
-                        }
-
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //console.log(row);
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            //if (row.source.indexOf("后台") != -1) {
-                                if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                    //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                    html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                                }
-                            //}
-                        }
-
-
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        //var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                    $("#idPdfT").val(data.id);
-                                }
-                            });
-                            $("#inpId").val(detailId);
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var detailId = row.id;
-                            $("#pdfId").val(row.id);
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                async: false,
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#pathPdf").val(data.pdfPath);
-                                }
-                            });
-                            var titleName = document.getElementById("nameLab").innerText;
-                            var iframeUrl = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url="+detailId+"?titleName=" + titleName);
-                            $('#pdf_page').attr('src', iframeUrl);
-                            //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            // //同步
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-                //idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                    //console.info(idArr);
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                //console.info("加载数据失败");
-                // toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
-
 
     $("#flag").click(function () {
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -4953,115 +4606,6 @@
         window.location.href = "${path}/commCtr/exportBbSel2Excel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+ "&remark=" + remark;
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $('#table2').bootstrapTable('uncheckAll');
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                //$('#table2').bootstrapTable('refresh');
-                idArr = [];
-            }
-        }
-    };
-
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                //toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
-
     $(document).keydown(function (event) {
         if (event.keyCode == 13) {
             searchNode();
diff --git a/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp b/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
index d9f33cb2..6839d416 100644
--- a/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
@@ -17,6 +17,7 @@
     <script type="text/javascript"
             src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -3294,348 +3295,6 @@
     var idArr = [];
     var flag = 0;
     var scollPostion2 = null;
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /*if (currPageSize == 2) {
-                    currPageSize = 10;
-                }*/
-
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            //if (row.source.indexOf("后台") != -1) {
-                            if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                            }
-                            //}
-                        }
-
-
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        //var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-
-                            //console.log(row);
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
-                                if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
-                                    $("#upPdfDiv").hide();
-                                    $("#inpType").attr("disabled", "true");
-
-                                } else {
-                                    $("#upPdfDiv").show();
-                                    $("#inpType").removeAttr("disabled");
-                                }
-                            } else {
-                                $("#upPdfDiv").show();
-                                $("#inpType").removeAttr("disabled");
-                            }
-                            if (row.source.indexOf("后台") != -1) {
-                                $("#addFile").show();
-                            } else {
-                                $("#addFile").hide();
-                                $("#inpType").attr("disabled", "true");
-                            }
-
-
-                            //同步
-                            $("#inpId").val(row.id);
-                            $("#inpTitle").val(row.title);
-                            $("#inpType").val(row.assortId);
-                            $("#inpSource").val(row.source);
-                            $("#inpFlag").val(row.flag);
-                            $("#pageNumber").val(row.pageNumber);
-                            //console.log("===="+ row.pdfPath);
-                            $("#pdfPathVal").val(row.pdfPath);
-                            if (row.pdfPath != "" && row.pdfPath != null) {
-                                $("#pdfPathVal").show();
-
-                                //..\..\..\static\img\pdfFiles\980bda8d-18e3-4deb-bb25-9d2b3784e9f3\HC3SL2HENH348M8X619PMCA7GC5R3125\HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
-                                var pdfUrl = "../../" + (row.pdfPath).replace(/\\/g, "/");
-
-                                $("#fileUrlInp").val(pdfUrl);
-                                // var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;
-
-                                $('#previewFile').css("display", "block");//显示预览按钮
-                                $('#addFile').attr("src", row.pdfPath);
-                                //$("#addFile").val("ssss");
-                                $('.inp_file').val(null);
-                            } else {
-                                $("#pdfPathVal").hide();
-                                $('#addFile').attr("src", "");
-                                $('.inp_file').val(null);
-                            }
-
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
-                            if (pdfPath != "") {
-                                pdfPath = pdfPath.replace(/(\\)+/g, '/');
-                                pdfPath = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
-                                $('#pdf_page').attr('src', pdfPath);
-                                //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            } else {
-                                toastr.warning("勾选的PDF文件不存在或破损!");
-                            }
-
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-                //idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                // console.info("加载数据失败");
-                // toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
     initTable2();
 
     //点击扫描全选分段列表，查询来源为嘉时扫描系统
@@ -3649,11 +3308,11 @@
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -3931,58 +3590,6 @@
 
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                //toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
     function getDept() {
         //获取科室列表
         $.ajax({
@@ -4007,63 +3614,6 @@
         });
     }
 
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $("#assortId").html(treeNode.id);
-                $("#source").html("");
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                //idArr = [];
-            }
-
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
-
     /*$(document).keydown(function (event) {
         if (event.keyCode == 13) {
             searchNode();
diff --git a/src/main/webapp/WEB-INF/views/font/collection.jsp b/src/main/webapp/WEB-INF/views/font/collection.jsp
index 09b40104..326f549e 100644
--- a/src/main/webapp/WEB-INF/views/font/collection.jsp
+++ b/src/main/webapp/WEB-INF/views/font/collection.jsp
@@ -14,6 +14,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -1002,8 +1003,6 @@
     var idArr = [];
     var flag = 0;
     var value = [];
-    var zNodes = [];
-    var nodeList = [];
     var opts = {
         lines: 13, // 花瓣数目
         length: 20, // 花瓣长度
@@ -1023,40 +1022,6 @@
         left: '450%'// spinner 相对父容器Left定位 单位 px
     };
     var spinner = new Spinner(opts);
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                //idArr = [];
-            }
-
-        }
-    };
-
     $(function () {
         var objUrl;
         var img_html;
@@ -2547,374 +2512,17 @@
 
     var scollPostion2 = null;
     //var eidtSelRow2=[];
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            geNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /*if (currPageSize == 2) {
-                    currPageSize = 10;
-                }*/
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                var deptAdmissionTo = "";
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title=$("#titleSearch").val();
-                if(title!=null && title!=""){
-                    temp.title=title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    // width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    // width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    // width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    //width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            if (row.source.indexOf("后台") != -1) {
-                                if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                    //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                    html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                                }
-                            }
-                        }
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
-                                if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
-                                    $("#upPdfDiv").hide();
-                                    $("#inpType").attr("disabled", "true");
-
-                                } else {
-                                    $("#upPdfDiv").show();
-                                    $("#inpType").removeAttr("disabled");
-                                }
-                            } else {
-                                $("#upPdfDiv").show();
-                                $("#inpType").removeAttr("disabled");
-                            }
-                            if (row.source.indexOf("后台") != -1) {
-                                $("#addFile").show();
-                            } else {
-                                $("#addFile").hide();
-                                $("#inpType").attr("disabled", "true");
-
-                            }
-
-
-                            //同步
-                            $("#inpId").val(row.id);
-                            $("#inpTitle").val(row.title);
-                            $("#inpType").val(row.assortId);
-                            $("#inpSource").val(row.source);
-                            $("#inpFlag").val(row.flag);
-                            // console.log(row);
-                            $("#pageNumber").val(row.pageNumber);
-                            //console.log("===="+ row.pdfPath);
-                            $("#pdfPathVal").val(row.pdfPath);
-                            if (row.pdfPath != "" && row.pdfPath != null) {
-                                $("#pdfPathVal").show();
-
-                                //..\..\..\static\img\pdfFiles\980bda8d-18e3-4deb-bb25-9d2b3784e9f3\HC3SL2HENH348M8X619PMCA7GC5R3125\HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
-                                var pdfUrl = "../../" + (row.pdfPath).replace(/\\/g, "/");
-
-                                $("#fileUrlInp").val(pdfUrl);
-                                // var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;
-
-                                $('#previewFile').css("display", "block");//显示预览按钮
-                                $('#addFile').attr("src", row.pdfPath);
-                                //$("#addFile").val("ssss");
-                                $('.inp_file').val(null);
-                            } else {
-                                $("#pdfPathVal").hide();
-                                $('#addFile').attr("src", "");
-                                $('.inp_file').val(null);
-                            }
-
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                            var pdfFileName = row.pdfPath;
-                            if (pdfFileName != null && pdfFileName != "") {
-                                pdfFileName = pdfFileName.substring(pdfFileName.lastIndexOf('\\') + 1, pdfFileName.lastIndexOf('.'));
-                                $("#pdfFileName").val(pdfFileName);
-                            }
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
-                            if (pdfPath != "") {
-                                pdfPath = pdfPath.replace(/(\\)+/g, '/');
-                                pdfPath = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
-                                $('#pdf_page').attr('src', pdfPath);
-                                //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            } else {
-                                toastr.warning("勾选的PDF文件不存在或破损!");
-                            }
-
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-               // idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                    //console.info(idArr);
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                // console.info("加载数据失败");
-                //toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                        //eidtSelRow2.push(rows[i].id);
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-
-               /* if(eidtSelRow2.indexOf(row.id)==-1){
-                    eidtSelRow2.push(row.id);
-                }*/
-
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-               /* var index2 = eidtSelRow2.indexOf(row.id);
-                if (index2 > -1) {
-                    eidtSelRow2.splice(index2, 1);
-                }*/
-                //console.log(eidtSelRow2);
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-               // eidtSelRow2= [];
-            }
-
-        });
-    }
-
     initTable2();
 
     $("#flag").click(function () {
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -3052,74 +2660,6 @@
 
     });
 
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                // toastr.error("加载失败!");
-            }
-        });
-    }
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
 
     $(document).keydown(function (event) {
         if (event.keyCode == 13) {
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
index 283a011f..ad40db2f 100644
--- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
+++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
@@ -13,6 +13,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -1044,8 +1045,6 @@
     var idArr = [];
     var flag = 0;
     var value = [];
-    var zNodes = [];
-    var nodeList = [];
     var opts = {
         lines: 13, // 花瓣数目
         length: 20, // 花瓣长度
@@ -1065,40 +1064,6 @@
         left: '450%'// spinner 相对父容器Left定位 单位 px
     };
     var spinner = new Spinner(opts);
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $('#table2').bootstrapTable('uncheckAll');
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                //$('#table2').bootstrapTable('refresh');
-                idArr = [];
-            }
-
-        }
-    };
 
     $(function () {
         var objUrl;
@@ -2691,325 +2656,6 @@
     }
 
     var scollPostion2 = null;
-    //var eidtSelRow2=[];
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            geNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /*if (currPageSize == 2) {
-                    currPageSize = 10;
-                }*/
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                var deptAdmissionTo = "";
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title=$("#titleSearch").val();
-                if(title!=null && title!=""){
-                    temp.title=title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    // width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    // width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    // width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    //width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            if (row.source.indexOf("后台") != -1) {
-                                if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                    //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                    html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                                }
-                            }
-                        }
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    console.log(data.title)
-                                    console.log(data)
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                }
-                            });
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                            var pdfFileName = row.pdfPath;
-                            if (pdfFileName != null && pdfFileName != "") {
-                                pdfFileName = pdfFileName.substring(pdfFileName.lastIndexOf('\\') + 1, pdfFileName.lastIndexOf('.'));
-                                $("#pdfFileName").val(pdfFileName);
-                            }
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
-                            if (pdfPath != "") {
-                                pdfPath = pdfPath.replace(/(\\)+/g, '/');
-                                pdfPath = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
-                                $('#pdf_page').attr('src', pdfPath);
-                                //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            } else {
-                                toastr.warning("勾选的PDF文件不存在或破损!");
-                            }
-
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-               // idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                    //console.info(idArr);
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                // console.info("加载数据失败");
-                //toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                        //eidtSelRow2.push(rows[i].id);
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-
-               /* if(eidtSelRow2.indexOf(row.id)==-1){
-                    eidtSelRow2.push(row.id);
-                }*/
-
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-               /* var index2 = eidtSelRow2.indexOf(row.id);
-                if (index2 > -1) {
-                    eidtSelRow2.splice(index2, 1);
-                }*/
-                //console.log(eidtSelRow2);
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-               // eidtSelRow2= [];
-            }
-
-        });
-    }
 
 
 
@@ -3017,11 +2663,11 @@
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -3160,81 +2806,6 @@
 
     });
 
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                // toastr.error("加载失败!");
-            }
-        });
-    }
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
-
-    $(document).keydown(function (event) {
-        if (event.keyCode == 13) {
-            searchNode();
-        }
-    });
-
     //展开
     function expandAll() {
         var treeObj = $.fn.zTree.getZTreeObj("ztree");
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 68f509ff..e0a1d9b7 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -22,9 +22,7 @@
     <script type="text/javascript"
             src="http://10.6.2.231/cdss/jssdk?v=4.0&ak=7C529E8A5ABF717778D62596C79EE51D"></script>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
-    <script>
-        var path = "${path}";
-    </script>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -4176,319 +4174,6 @@
     var flag = 0;
     var scollPostion2 = null;
 
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /*if (currPageSize == 2) {
-                    currPageSize = 10;
-                }*/
-
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source = null;
-                if ($("#sourceSearch").val() != null) {
-                    source = $("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                    formatter: function (value, row, index) {
-                        var a = "";
-                        if (row.inpNo != null && row.inpNo != "") {
-                            a = value + row.inpNo;
-                        } else {
-                            a = value;
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            //if (row.source.indexOf("后台") != -1) {
-                            if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                            }
-                            //}
-                        }
-
-
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        //var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                    $("#pathPdf").val(data.pdfPath);
-                                    $("#idPdfT").val(data.id);
-                                }
-                            });
-                            $("#inpId").val(detailId);
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idT").val(row.id);
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var detailId = row.id;
-                            $("#pdfId").val(row.id);
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                async: false,
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#pathPdf").val(data.pdfPath);
-                                }
-                            });
-                            var titleName = document.getElementById("nameLab").innerText;
-                            var iframeUrl = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + detailId + "?titleName=" + titleName);
-                            $('#pdf_page').attr('src', iframeUrl);
-                            //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            // //同步
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-                //idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                // console.info("加载数据失败");
-                // toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if (idArr.indexOf(row.id) == -1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if (idArr.indexOf(row.id) == -1) {
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
 
     // initTable2();
 
@@ -4503,11 +4188,11 @@
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -4792,116 +4477,6 @@
             + "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum + "&isFault=" + isFault + "&deathFlag=";
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                //toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $('#table2').bootstrapTable('uncheckAll');
-                $("#assortId").html(treeNode.id);
-
-                $("#source").html("");
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                //$('#table2').bootstrapTable('refresh');
-                idArr = [];
-            }
-
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
 
     /*$(document).keydown(function (event) {
         if (event.keyCode == 13) {
diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp
index e11cd405..78dc7c3f 100644
--- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp
@@ -15,7 +15,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
-
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -2405,328 +2405,6 @@
     var idArr = [];
     var flag=0;
     var scollPostion2 = null;
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 2, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            //height: 560,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                if (currPageSize == 2) {
-                    currPageSize = 10;
-                }
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag:flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false,
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //addFile
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
-                                if (row.pdfPath.indexOf(row.assortId + ".pdf") == -1) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-
-                        if (row.source != null && row.source != "") {
-                            if (row.source.indexOf("后台") != -1) {
-								if (index != null && index != "" && index.indexOf("delPage") != -1) {
-									//return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-									html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-								}
-						    }
-                        }
-
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            //console.log(row);
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
-                                if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
-                                    $("#upPdfDiv").hide();
-                                    $("#inpType").attr("disabled", "true");
-
-                                } else {
-                                    $("#upPdfDiv").show();
-                                    $("#inpType").removeAttr("disabled");
-                                }
-                            } else {
-                                $("#upPdfDiv").show();
-                                $("#inpType").removeAttr("disabled");
-                            }
-                            if (row.source.indexOf("后台") != -1) {
-                                $("#addFile").show();
-                            } else {
-                                $("#addFile").hide();
-                                $("#inpType").attr("disabled", "true");
-                            }
-
-
-                            //同步
-                            $("#inpId").val(row.id);
-                            $("#inpTitle").val(row.title);
-                            $("#inpType").val(row.assortId);
-                            $("#inpSource").val(row.source);
-                            $("#inpFlag").val(row.flag);
-                            $("#pageNumber").val(row.pageNumber);
-                            //console.log("===="+ row.pdfPath);
-                            $("#pdfPathVal").val(row.pdfPath);
-                            if (row.pdfPath != "" && row.pdfPath != null) {
-                                $("#pdfPathVal").show();
-
-                                //..\..\..\static\img\pdfFiles\980bda8d-18e3-4deb-bb25-9d2b3784e9f3\HC3SL2HENH348M8X619PMCA7GC5R3125\HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
-                                var pdfUrl = "../../" + (row.pdfPath).replace(/\\/g, "/");
-
-                                $("#fileUrlInp").val(pdfUrl);
-                                // var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;
-
-                                $('#previewFile').css("display", "block");//显示预览按钮
-                                $('#addFile').attr("src", row.pdfPath);
-                                //$("#addFile").val("ssss");
-                                $('.inp_file').val(null);
-                            } else {
-                                $("#pdfPathVal").hide();
-                                $('#addFile').attr("src", "");
-                                $('.inp_file').val(null);
-                            }
-
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-                // console.info("加载成功");
-            },
-            onLoadError: function () {  //加载失败时执行
-                //console.info("加载数据失败");
-                //toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
 
     //点击扫描全选分段列表，查询来源为嘉时扫描系统
     /*$("#pdfBtn3").click(function () {
@@ -2739,11 +2417,11 @@
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -2833,113 +2511,6 @@
 
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                // toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                //idArr = [];
-            }
-
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
 
     $(document).keydown(function (event) {
         if (event.keyCode == 13) {
diff --git a/src/main/webapp/WEB-INF/views/reloadWz.jsp b/src/main/webapp/WEB-INF/views/reloadWz.jsp
index 45e7d0d9..66610751 100644
--- a/src/main/webapp/WEB-INF/views/reloadWz.jsp
+++ b/src/main/webapp/WEB-INF/views/reloadWz.jsp
@@ -20,6 +20,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../jspf/comm.jspf" %>
     <%@ include file="../jspf/ztreeCommom.jsp" %>
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
 </head>
 <style>
     body{
@@ -172,203 +173,6 @@
         var scollPostion2 = null;
         var idArr=[];
         //var eidtSelRow2=[];
-        function initTable2() {
-            //idArr = [];
-            $("#table2").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/geWZdetail", // 获取表格数据的url
-                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-                //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                striped: true,  //表格显示条纹，默认为false
-                pagination: true, // 在表格底部显示分页组件，默认false
-                paginationShowPageGo: true,
-                pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                smartDisplay: false,
-                pageSize: 10, // 页面数据条数
-                geNumber: 1, // 初始化加载第一页，默认第一页
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-               // toolbar: '#toolbar2',//指定工具栏
-                showColumns: true,
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '---', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                height: 650,     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                queryParams: function (params) {
-                    var currPageSize = this.pageSize;
-                    /*if (currPageSize == 2) {
-                        currPageSize = 10;
-                    }*/
-                    var limit = null;
-                    var offset = params.offset;
-
-                    //判断是否导出全部all
-                    if ($("#sel_exportoption").val() == "all") {
-                        offset = 0;
-                        limit = this.totalRows;
-                        this.pageSize = limit;
-                    } else {
-                        limit = currPageSize;
-                        this.pageSize = currPageSize;
-                    }
-                    var inpNo = $("#inpNo2").val();
-                    var visitId = $("#visitId2").val();
-                    var checkDatetime = $("#startDateTo").val();
-                    var checkedDatetime = $("#endDateTo").val();
-
-                    var temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        order: params.order,      //排位命令（desc，asc）
-                        inpNo: inpNo,
-                        visitId: visitId,
-                        checkDatetime: checkDatetime,
-                        checkedDatetime: checkedDatetime
-                    };
-
-
-                    return temp;
-                },
-                sortName: 'assortSort', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'center',
-                    hidden: true,
-                }, {
-                    title: '序号',
-                    field: 'id',
-                    align: 'center',
-                    valign: 'middle',
-                    //sortable: true,
-                    // visible: false,
-                    formatter: function (value, row, index) {
-                        return index + 1;
-                    }
-                },
-
-                    {
-                        title: '病案id',
-                        field: 'masterId',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-
-                    {
-                        title: '住院号',
-                        field: 'inpNo',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '住院次数',
-                        field: 'visitId',
-                        align: 'left',
-                        valign: 'middle',
-                        // width: 150, // 定义列的宽度，单位为像素px
-                    },
-                    {
-                        title: '出院日期',
-                        field: 'dischargeDateTime',
-                        align: 'center',
-                        valign: 'middle',
-                        // width: 50, // 定义列的宽度，单位为像素px
-                    },
-                    {
-                        title: '校验完成日期',
-                        field: 'checkedDatetime',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '完整性内容',
-                        field: 'lockinfo',
-                        align: 'left',
-                        valign: 'middle',
-                        // width: 50, // 定义列的宽度，单位为像素px
-                    },
-                    {
-                        title: "操作",
-                        align: 'left',
-                        valign: 'middle',
-                        //width: 120, // 定义列的宽度，单位为像素px
-                        formatter: function (value, row, index) {
-                            var html = "";
-                            html = html + '<button type="button" class="btn btn-info btn-sm wzInfo" >重置校验 </button>';
-                            return html;
-                        }, events: {
-                            'click .wzInfo': function (e, value, row, index) {
-                                   //重置校验
-                                $("#masterId2").val(row.masterId);
-                                wzCheckFun();
-                            }
-                        },
-                        cellStyle: function (value, row, index) {
-                            return {classes: 'success'}
-
-                        }
-                    }
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    // console.info("加载成功");
-                    // idArr = [];
-                    $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                    if (idArr != []) {
-                        //对刷新表格的数据选中之前选的id行
-                        $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                        //console.info(idArr);
-                    }
-                },
-                onLoadError: function () {  //加载失败时执行
-                    // console.info("加载数据失败");
-                    //toastr.warning("用户长时间未操作，请重新登录!");
-                }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                    if (rows != null && rows.length) {
-                        for (var i = 0; i < rows.length; i++) {
-                            if(idArr.indexOf(row.id)==-1) {
-                                idArr.push(rows[i].id);
-                            }
-                            //eidtSelRow2.push(rows[i].id);
-                        }
-                    }
-                }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                    scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                    if(idArr.indexOf(row.id)==-1){
-                        idArr.push(row.id);
-                    }
-
-                    /* if(eidtSelRow2.indexOf(row.id)==-1){
-                         eidtSelRow2.push(row.id);
-                     }*/
-
-                }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                    var index = idArr.indexOf(row.id);
-                    if (index > -1) {
-                        idArr.splice(index, 1);
-                    }
-                    /* var index2 = eidtSelRow2.indexOf(row.id);
-                     if (index2 > -1) {
-                         eidtSelRow2.splice(index2, 1);
-                     }*/
-                    //console.log(eidtSelRow2);
-                }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                    idArr = [];
-                    // eidtSelRow2= [];
-                }
-
-            });
-        }
-
         initTable2();
     });
 </script>
diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
index 04304cc6..81e807a5 100644
--- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
+++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
@@ -17,6 +17,7 @@
     <script type="text/javascript"
             src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -3830,313 +3831,6 @@
     var flag = 0;
     var scollPostion2 = null;
 
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height: 650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /*if (currPageSize == 2) {
-                    currPageSize = 10;
-                }*/
-
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source = null;
-                if ($("#sourceSearch").val() != null) {
-                    source = $("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-                        if (row.source != null && row.source != "") {
-                            //if (row.source.indexOf("后台") != -1) {
-                            if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                            }
-                            //}
-                        }
-
-
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        //var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                    $("#idPdfT").val(data.id);
-                                }
-                            });
-                            $("#inpId").val(detailId);
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
-                            if (pdfPath != "") {
-                                pdfPath = pdfPath.replace(/(\\)+/g, '/');
-                                pdfPath = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
-                                $('#pdf_page').attr('src', pdfPath);
-                                //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            } else {
-                                toastr.warning("勾选的PDF文件不存在或破损!");
-                            }
-
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                // console.info("加载成功");
-                //idArr = [];
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                // console.info("加载数据失败");
-                // toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if (idArr.indexOf(row.id) == -1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if (idArr.indexOf(row.id) == -1) {
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
-
-
     //点击扫描全选分段列表，查询来源为嘉时扫描系统
     /*$("#pdfBtn3").click(function () {
         $("#assortId").html("");
@@ -4148,11 +3842,11 @@
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -4462,57 +4156,6 @@
 
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                //toastr.error("加载失败!");
-            }
-        });
-
-
-    }
 
     function getDept() {
         //获取科室列表
@@ -4538,63 +4181,6 @@
         });
     }
 
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $("#assortId").html(treeNode.id);
-                $("#source").html("");
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                $('#table2').bootstrapTable('refresh');
-                //idArr = [];
-            }
-
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
-
     /*$(document).keydown(function (event) {
         if (event.keyCode == 13) {
             searchNode();
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index d63fda14..ee696e65 100644
--- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -19,6 +19,7 @@
     <script type="text/javascript"
             src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
     <style>
         .modal-header2 {
             height: 30px;
@@ -3622,320 +3623,16 @@
     var idArr = [];
     var flag = 0;
     var scollPostion2 = null;
-    function initTable2() {
-        //idArr = [];
-        $("#table2").bootstrapTable({ // 对应table标签的id
-            //method: 'POST',
-            url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url
-            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            paginationShowPageGo: true,
-            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-            smartDisplay: false,
-            pageSize: 10, // 页面数据条数
-            pageNumber: 1, // 初始化加载第一页，默认第一页
-            sidePagination: 'server', // 设置为服务器端分页     客户端：client
-            search: false,
-            toolbar: '#toolbar2',//指定工具栏
-            showColumns: true,
-            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-            undefinedText: '---', //当数据为 undefined 时显示的字符
-            singleSelect: false,//设置True 将禁止多选
-            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-            height:650,     //定义表格的高度。
-            searchTimeOut: 500,// 默认500  设置搜索超时时间。
-            toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-            showHeader: true,//是否显示列头。
-            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-            queryParams: function (params) {
-                var currPageSize = this.pageSize;
-                /* if (currPageSize == 2) {
-                     currPageSize = 10;
-                 }*/
-                var limit = null;
-                var offset = params.offset;
-                var patientId = $("#idLab").html();
-                var assortId = $("#assortId").html();
-                if (assortId == 0) assortId = null;
-                //判断是否导出全部all
-                if ($("#sel_exportoption").val() == "all") {
-                    offset = 0;
-                    limit = this.totalRows;
-                    this.pageSize = limit;
-                } else {
-                    limit = currPageSize;
-                    this.pageSize = currPageSize;
-                }
-                var source =null;
-                if($("#sourceSearch").val()!=null){
-                    source=$("#sourceSearch").val();
-                }
-                var temp = {
-                    limit: limit,     //页面大小
-                    offset: offset,   //页码
-                    order: params.order,      //排位命令（desc，asc）
-                    patientId: patientId,
-                    assortId: assortId,
-                    source: source,
-                    flag: flag
-                };
-
-                var title = $("#titleSearch").val();
-                if (title != null && title != "") {
-                    temp.title = title;
-                }
-                return temp;
-            },
-            sortName: 'assortSort', // 要排序的字段
-            sortOrder: 'desc', // 排序规则
-            columns: [{
-                title: '全选',
-                field: 'select',   //复选框
-                checkbox: true,
-                width: 25,
-                align: 'center',
-                hidden: true,
-            }, {
-                title: '序',
-                field: 'id',
-                align: 'left',
-                visible: false
-            },
-
-                {
-                    title: '分段类id',
-                    field: 'assortId',
-                    align: 'left',
-                    valign: 'middle',
-                    visible: false
-                },
-
-                {
-                    title: '标题',
-                    field: 'title',
-                    align: 'left',
-                    valign: 'middle',
-                },
-                {
-                    title: '上传时间',
-                    field: 'uploaddatetime',
-                    align: 'left',
-                    valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '来源',
-                    field: 'source',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
-                },
-                {
-                    title: '状态',
-                    field: 'flag',
-                    align: 'center',
-                    valign: 'middle',
-                    width: 80, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //在院  未归档  归档中  初审 已归档 已认证
-                        var a = '';
-                        if (value == "1") {
-                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
-                        } else if (value == "0") {
-                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
-                        }
-                        return a;
-                    }
-                },
-                {
-                    title: "操作",
-                    align: 'left',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-
-                        var html = "";
-
-                        if (index != null && index != "" && index.indexOf("edit") != -1) {
-                            //addFile
-                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-
-
-                        }
-
-                        if (index != null && index != "" && index.indexOf("cancel") != -1) {
-                            if (row.flag == "0") {
-                                html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
-                            }
-                        }
-
-                        if (index != null && index != "" && index.indexOf("delPdf") != -1) {
-                            //console.log("===:" + row.pdfPath + "====" + row.source);
-                            //删除
-                            if (row.pdfPath != null && row.pdfPath != "") {
-                                var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
-                                if (pdfName != row.assortId) {
-                                    if (row.source != null && row.source != "") {
-                                        if (row.source.indexOf("后台") != -1) {
-                                            html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                        }
-                                    }
-                                }
-                            } else {
-
-                                if (row.source != null && row.source != "") {
-                                    if (row.source.indexOf("后台") != -1) {
-                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
-                                    }
-                                }
-                            }
-                        }
-
-
-                        if (row.source != null && row.source != "") {
-                            if (row.source.indexOf("后台") != -1) {
-                                if (index != null && index != "" && index.indexOf("delPage") != -1) {
-                                    //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                    html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                                }
-                            }
-                        }
-
-
-                        return html;
-                    }, events: {
-                        'click .editInfo': function (e, value, row, index) {
-                            var detailId = row.id;
-                            $.ajax({
-                                url: "${path}/inHosp/getDetailInfo",
-                                type: "POST",
-                                data: {detailId: detailId},
-                                success: function (data) {
-                                    $("#inpTitle").val(data.title)
-                                    $("#pageNumber").val(data.pageNumber)
-                                    $("#inpSource").val(data.source)
-                                    $("#inpFlag").val(data.flag)
-                                    $("#pdfPathVal").val(data.pdfPath)
-                                    $("#idPdfT").val(data.id);
-                                }
-                            });
-                            $("#inpId").val(detailId);
-                            $('#assortModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                        }, 'click .stateInfo': function (e, value, row, index) {
-                            $('#exampleModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            //同步
-                            $("#idT").val(row.id);
-
-                        }, 'click .delPdfInfo': function (e, value, row, index) {
-                            $('#delPdfModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-                            //同步
-                            $("#idPdfT").val(row.id);
-                        }, 'click .delPdfPage': function (e, value, row, index) {
-                            $("#mb").css("display", "block");
-                            var target = document.getElementById('delPdfBody');
-                            spinner.spin(target);//给id为foo的div 中绑上spinner
-                            var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
-                            if (pdfPath != "") {
-                                pdfPath = pdfPath.replace(/(\\)+/g, '/');
-                                pdfPath = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
-                                $('#pdf_page').attr('src', pdfPath);
-                                //病案号 45e9b098f9da49ffba1843bfc6930cb8
-                            } else {
-                                toastr.warning("勾选的PDF文件不存在或破损!");
-                            }
-
-                            //删除pdf某一页
-                            $('#delPdfPageModal').modal({
-                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                show: true//弹出对话框
-                            });
-
-                            // //同步
-                            $("#pdfId").val(row.id);
-                            $("#pathPdf").val(row.pdfPath);
-                            getDelPicPageFun();
-                            setTimeout(function () {
-                                $("#mb").css("display", "none");
-                                spinner.spin();
-                            }, 1500);
-                        }
-                    },
-                    cellStyle: function (value, row, index) {
-                        return {classes: 'success'}
-
-                    }
-                }
-            ],
-            onLoadSuccess: function (result) {  //加载成功时执行
-                //idArr = [];
-                // console.info("加载成功");
-                $('#table2').bootstrapTable('scrollTo', scollPostion2);
-                if (idArr != []) {
-                    //对刷新表格的数据选中之前选的id行
-                    $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
-                }
-            },
-            onLoadError: function () {  //加载失败时执行
-                //console.info("加载数据失败");
-                //toastr.warning("用户长时间未操作，请重新登录!");
-            }, onCheckAll: function (rows) { //点击全选框时触发的操作
-                if (rows != null && rows.length) {
-                    for (var i = 0; i < rows.length; i++) {
-                        if(idArr.indexOf(row.id)==-1) {
-                            idArr.push(rows[i].id);
-                        }
-                    }
-                }
-            }, onCheck: function (row) {//点击每一个单选框时触发的操作
-                scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
-                if(idArr.indexOf(row.id)==-1){
-                    idArr.push(row.id);
-                }
-            }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
-                var index = idArr.indexOf(row.id);
-                if (index > -1) {
-                    idArr.splice(index, 1);
-                }
-            }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
-                idArr = [];
-            }
-
-        });
-    }
-
 
     $("#flag").click(function () {
         if ($("#flag").is(":checked") == true) {
             //选中触发事件
             flag = 1;
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         } else {
             flag = 0;
             //取消选中触发事件
-            $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
         }
         initTree($("#idLab").html());
         //idArr = [];
@@ -4042,114 +3739,6 @@
             + "&bedNumber=" + bedNumber + "&deathFlag=" + deathFlag + "&printNum=" + printNum;
     });
 
-    var zNodes = [];
-    var nodeList = [];
-
-    function initTree(patientId) {
-        var target = document.getElementById('foo');
-        spinner.spin(target);//给id为foo的div 中绑上spinner
-        zNodes = [];
-        //获取所有分段列表
-        $.ajax({
-            url: "${path}/inHosp/getAssort",
-            type: "POST",
-            data: {patientId: patientId, flag: flag},
-            async: true,
-            success: function (result) {
-                zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
-                if (result.length > 0) {
-                    for (var i = 0; i < result.length; i++) {
-                        //下拉类别
-                        //$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
-                        //树列表
-                        var obj = {};
-                        obj.id = result[i].assortId;
-                        obj.pId = 0;
-                        obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
-                        obj.assortSort = result[i].assortSort;
-                        obj.patientId = result[i].patientId;
-                        obj.printFlag = result[i].printFlag;
-                        zNodes.push(obj);
-                    }
-                }
-                //$.fn.zTree.init($("#ztree"), setting, zNodes);
-                var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
-                var node;
-                var currId = $("#assortId").html();
-                if (currId != "" && currId != null) {
-                    //修改选中已选节点
-                    node = treeObj.getNodeByParam("id", currId);
-                } else {
-                    //添加选中父节点
-                    var node = treeObj.getNodeByParam("id", 0);
-                }
-                treeObj.selectNode(node, true);//将指定ID的节点选中
-                $('#table2').bootstrapTable('refresh');
-                spinner.spin();
-            }, error: function () {
-                // toastr.error("加载失败!");
-            }
-        });
-
-
-    }
-
-    var setting = {
-        view: {
-            addHoverDom: false,
-            removeHoverDom: false,
-            selectedMulti: false,
-            autoCancelSelected: false
-        },
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true,
-                idKey: "id",
-                pIdKey: "pId",
-                rootPId: "0"
-            }
-        },
-        edit: {
-            enable: false
-        },
-        callback: {
-            beforeClick: function (treeId, treeNode) {
-                $('#table2').bootstrapTable('uncheckAll');
-                $("#assortId").html(treeNode.id);
-                //查询之后重新从第一页算起
-                $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
-                //刷新
-                //$('#table2').bootstrapTable('refresh');
-                idArr = [];
-            }
-
-        }
-    };
-
-    function searchNode() {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        var value = $("#key").val();
-        if (value == "") {
-            var nodes = zTree.getNodesByParam("isHidden", true);
-            zTree.showNodes(nodes);
-        } else {
-            nodeList = zTree.getNodesByParamFuzzy("name", value);
-            var nodes = zTree.getNodes();
-            zTree.hideNodes(nodes[0].children);
-            updateNodes(true);
-        }
-        zTree.expandAll(true);
-    }
-
-    function updateNodes(highlight) {
-        var zTree = $.fn.zTree.getZTreeObj("ztree");
-        for (var i = 0, l = nodeList.length; i < l; i++) {
-            zTree.showNode(nodeList[i]);
-        }
-    }
 
     $(document).keydown(function (event) {
         if (event.keyCode == 13) {
diff --git a/src/main/webapp/static/js/loadAssortDetailCommom.js b/src/main/webapp/static/js/loadAssortDetailCommom.js
new file mode 100644
index 00000000..48df0d23
--- /dev/null
+++ b/src/main/webapp/static/js/loadAssortDetailCommom.js
@@ -0,0 +1,418 @@
+<!--文件列表相关操作-->
+//文件列表请求接口地址
+var tableReqUrl = path+"/inHosp/getAssortdetail";
+function initTable2() {
+    // idArr = [];
+    $("#table2").bootstrapTable({ // 对应table标签的id
+        //method: 'POST',
+        url: "", // 获取表格数据的url
+        contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+        //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
+        cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+        striped: true,  //表格显示条纹，默认为false
+        pagination: true, // 在表格底部显示分页组件，默认false
+        paginationShowPageGo: true,
+        pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+        smartDisplay: false,
+        pageSize: 10, // 页面数据条数
+        pageNumber: 1, // 初始化加载第一页，默认第一页
+        sidePagination: 'server', // 设置为服务器端分页     客户端：client
+        search: false,
+        toolbar: '#toolbar2',//指定工具栏
+        showColumns: true,
+        searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+        undefinedText: '---', //当数据为 undefined 时显示的字符
+        singleSelect: false,//设置True 将禁止多选
+        clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+        height: 650,     //定义表格的高度。
+        searchTimeOut: 500,// 默认500  设置搜索超时时间。
+        toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+        paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+        showHeader: true,//是否显示列头。
+        trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+        queryParams: function (params) {
+
+            var currPageSize = this.pageSize;
+            /* if (currPageSize == 2) {
+                 currPageSize = 10;
+             }*/
+            var limit = null;
+            var offset = params.offset;
+            var patientId = $("#idLab").html();
+            var assortId = $("#assortId").html();
+            if (assortId == 0) assortId = null;
+            //判断是否导出全部all
+            if ($("#sel_exportoption").val() == "all") {
+                offset = 0;
+                limit = this.totalRows;
+                this.pageSize = limit;
+            } else {
+                limit = currPageSize;
+                this.pageSize = currPageSize;
+            }
+            var source = null;
+            if ($("#sourceSearch").val() != null) {
+                source = $("#sourceSearch").val();
+            }
+            var temp = {
+                limit: limit,     //页面大小
+                offset: offset,   //页码
+                order: params.order,      //排位命令（desc，asc）
+                patientId: patientId,
+                assortId: assortId,
+                source: source,
+                flag: flag
+            };
+
+            var title = $("#titleSearch").val();
+            if (title != null && title != "") {
+                temp.title = title;
+            }
+            return temp;
+        },
+        sortName: 'assortSort', // 要排序的字段
+        sortOrder: 'desc', // 排序规则
+        columns: [{
+            title: '全选',
+            field: 'select',   //复选框
+            checkbox: true,
+            width: 25,
+            align: 'center',
+            hidden: true,
+        }, {
+            title: '序',
+            field: 'id',
+            align: 'left',
+            visible: false
+        },
+
+            {
+                title: '分段类id',
+                field: 'assortId',
+                align: 'left',
+                valign: 'middle',
+                visible: false
+            },
+
+            {
+                title: '标题',
+                field: 'title',
+                align: 'left',
+                valign: 'middle',
+            },
+            {
+                title: '上传时间',
+                field: 'uploaddatetime',
+                align: 'left',
+                valign: 'middle',
+                width: 150, // 定义列的宽度，单位为像素px
+            },
+            {
+                title: '来源',
+                field: 'source',
+                align: 'center',
+                valign: 'middle',
+                width: 50, // 定义列的宽度，单位为像素px
+            },
+            {
+                title: '状态',
+                field: 'flag',
+                align: 'center',
+                valign: 'middle',
+                width: 80, // 定义列的宽度，单位为像素px
+                formatter: function (value, row, index) {
+                    //在院  未归档  归档中  初审 已归档 已认证
+                    var a = '';
+                    if (value == "1") {
+                        a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>作废</span>';
+                    } else if (value == "0") {
+                        a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>使用</span>';
+                    }
+                    return a;
+                }
+            },
+            {
+                title: "操作",
+                align: 'left',
+                valign: 'middle',
+                width: 120, // 定义列的宽度，单位为像素px
+                formatter: function (value, row, index) {
+                    //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
+                    // var html = '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
+                    // if (row.flag == "0") {
+                    //     html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
+                    // }
+                    var url = window.location.href;
+                    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+
+                    var html = "";
+                    if (index != null && index != "" && index.indexOf("edit") != -1) {
+                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
+                        html = html + '<button type="button" class="btn btn-info btn-sm editInfo" >编辑 </button>';// '<a href="javascript:;" class="delete">删除</a>';
+
+
+                    }
+
+                    if (index != null && index != "" && index.indexOf("cancel") != -1) {
+                        if (row.flag == "0") {
+                            html = html + '<button type="button" class="btn btn-danger btn-sm stateInfo" >作废 </button>';
+                        }
+                    }
+
+                    if (index != null && index != "" && index.indexOf("delPdf") != -1) {
+                        //console.log("===:" + row.pdfPath + "====" + row.source);
+                        //删除
+                        if (row.pdfPath != null && row.pdfPath != "") {
+                            var pdfName = row.pdfPath.substring(row.pdfPath.lastIndexOf('\\') + 1, row.pdfPath.lastIndexOf('.'));
+                            if (pdfName != row.assortId) {
+                                if (row.source != null && row.source != "") {
+                                    if (row.source.indexOf("后台") != -1) {
+                                        html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
+                                    }
+                                }
+                            }
+                        } else {
+
+                            if (row.source != null && row.source != "") {
+                                if (row.source.indexOf("后台") != -1) {
+                                    html = html + '<button type="button" class="btn btn-warning btn-sm delPdfInfo" >删除 </button>';
+                                }
+                            }
+                        }
+                    }
+                    if (index != null && index != "" && index.indexOf("delPage") != -1) {
+                        //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
+                        html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
+
+                    }
+
+
+                    return html;
+                }, events: {
+                    'click .editInfo': function (e, value, row, index) {
+                        var detailId = row.id;
+                        $.ajax({
+                            url: "${path}/inHosp/getDetailInfo",
+                            type: "POST",
+                            data: {detailId: detailId},
+                            success: function (data) {
+                                $("#inpTitle").val(data.title)
+                                $("#pageNumber").val(data.pageNumber)
+                                $("#inpSource").val(data.source)
+                                $("#inpFlag").val(data.flag)
+                                $("#pdfPathVal").val(data.pdfPath)
+                                $("#idPdfT").val(data.id);
+                            }
+                        });
+                        $("#inpId").val(detailId);
+                        $('#assortModal').modal({
+                            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                            show: true//弹出对话框
+                        });
+                    }, 'click .stateInfo': function (e, value, row, index) {
+                        $('#exampleModal').modal({
+                            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                            show: true//弹出对话框
+                        });
+
+                        //同步
+                        $("#idT").val(row.id);
+
+                    }, 'click .delPdfInfo': function (e, value, row, index) {
+                        $('#delPdfModal').modal({
+                            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                            show: true//弹出对话框
+                        });
+                        //同步
+                        $("#idPdfT").val(row.id);
+                    }, 'click .delPdfPage': function (e, value, row, index) {
+                        $("#mb").css("display", "block");
+                        var target = document.getElementById('delPdfBody');
+                        spinner.spin(target);//给id为foo的div 中绑上spinner
+                        var detailId = row.id;
+                        $("#pdfId").val(row.id);
+                        $.ajax({
+                            url: "${path}/inHosp/getDetailInfo",
+                            async: false,
+                            type: "POST",
+                            data: {detailId: detailId},
+                            success: function (data) {
+                                $("#pathPdf").val(data.pdfPath);
+                            }
+                        });
+                        var titleName = document.getElementById("nameLab").innerText;
+                        var iframeUrl = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url="+detailId+"?titleName=" + titleName);
+                        $('#pdf_page').attr('src', iframeUrl);
+                        //病案号 45e9b098f9da49ffba1843bfc6930cb8
+                        //删除pdf某一页
+                        $('#delPdfPageModal').modal({
+                            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                            show: true//弹出对话框
+                        });
+                        // //同步
+                        getDelPicPageFun();
+                        setTimeout(function () {
+                            $("#mb").css("display", "none");
+                            spinner.spin();
+                        }, 1500);
+                    }
+                },
+                cellStyle: function (value, row, index) {
+                    return {classes: 'success'}
+
+                }
+            }
+        ],
+        onLoadSuccess: function (result) {  //加载成功时执行
+            // console.info("加载成功");
+            //idArr = [];
+            $('#table2').bootstrapTable('scrollTo', scollPostion2);
+            if (idArr != []) {
+                //对刷新表格的数据选中之前选的id行
+                $('#table2').bootstrapTable("checkBy", {field: 'id', values: idArr});
+            }
+        },
+        onLoadError: function () {  //加载失败时执行
+            //console.info("加载数据失败");
+            //toastr.warning("用户长时间未操作，请重新登录!");
+        }, onCheckAll: function (rows) { //点击全选框时触发的操作
+            if (rows != null && rows.length) {
+                for (var i = 0; i < rows.length; i++) {
+                    if (idArr.indexOf(row.id) == -1) {
+                        idArr.push(rows[i].id);
+                    }
+                }
+            }
+        }, onCheck: function (row) {//点击每一个单选框时触发的操作
+            scollPostion2 = $('#table2').bootstrapTable('getScrollPosition');
+            if (idArr.indexOf(row.id) == -1) {
+                idArr.push(row.id);
+            }
+        }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
+            var index = idArr.indexOf(row.id);
+            if (index > -1) {
+                idArr.splice(index, 1);
+            }
+        }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
+            idArr = [];
+        }
+
+    });
+}
+
+function refreshTable2(){
+    $('#table2').bootstrapTable('refresh',{url:tableReqUrl});
+}
+
+
+<!--树相关操作-->
+var zNodes = [];
+var nodeList = [];
+
+function initTree(patientId) {
+    var target = document.getElementById('foo');
+    spinner.spin(target);//给id为foo的div 中绑上spinner
+    zNodes = [];
+    //获取所有分段列表
+    $.ajax({
+        url: path+"/inHosp/getAssort",
+        type: "POST",
+        data: {patientId: patientId, flag: flag},
+        async: true,
+        success: function (result) {
+            zNodes.push({id: 0, pId: 0, name: "分段列表", open: true});
+            if (result.length > 0) {
+                for (var i = 0; i < result.length; i++) {
+                    //下拉类别
+                    // $("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
+                    //树列表
+                    var obj = {};
+                    obj.id = result[i].assortId;
+                    obj.pId = 0;
+                    obj.name = "" + result[i].assortName + "(" + (result[i].pageNum) + ")";
+                    obj.assortSort = result[i].assortSort;
+                    obj.patientId = result[i].patientId;
+                    obj.printFlag = result[i].printFlag;
+                    zNodes.push(obj);
+                }
+            }
+            //$.fn.zTree.init($("#ztree"), setting, zNodes);
+            var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
+            var node;
+            var currId = $("#assortId").html();
+            if (currId != "" && currId != null) {
+                //修改选中已选节点
+                node = treeObj.getNodeByParam("id", currId);
+            } else {
+                //添加选中父节点
+                var node = treeObj.getNodeByParam("id", 0);
+            }
+            treeObj.selectNode(node, true);//将指定ID的节点选中
+            //刷新
+            //$('#table2').bootstrapTable('refresh');
+            spinner.spin();
+        }, error: function () {
+            //toastr.error("加载失败!");
+        }
+    });
+}
+
+var setting = {
+    view: {
+        addHoverDom: false,
+        removeHoverDom: false,
+        selectedMulti: false,
+        autoCancelSelected: false
+    },
+    check: {
+        enable: true
+    },
+    data: {
+        simpleData: {
+            enable: true,
+            idKey: "id",
+            pIdKey: "pId",
+            rootPId: "0"
+        }
+    },
+    edit: {
+        enable: false
+    },
+    callback: {
+        beforeClick: function (treeId, treeNode) {
+            $('#table2').bootstrapTable('uncheckAll');
+            $("#assortId").html(treeNode.id);
+            //查询之后重新从第一页算起
+            //$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
+            //刷新
+            refreshTable2()
+            idArr = [];
+        }
+    }
+};
+
+function searchNode() {
+    var zTree = $.fn.zTree.getZTreeObj("ztree");
+    var value = $("#key").val();
+    if (value == "") {
+        var nodes = zTree.getNodesByParam("isHidden", true);
+        zTree.showNodes(nodes);
+    } else {
+        nodeList = zTree.getNodesByParamFuzzy("name", value);
+        var nodes = zTree.getNodes();
+        zTree.hideNodes(nodes[0].children);
+        updateNodes(true);
+    }
+    zTree.expandAll(true);
+}
+
+function updateNodes(highlight) {
+    var zTree = $.fn.zTree.getZTreeObj("ztree");
+    for (var i = 0, l = nodeList.length; i < l; i++) {
+        zTree.showNode(nodeList[i]);
+    }
+}
\ No newline at end of file