diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf
index 11f6774..75c5b23 100644
--- a/src/main/webapp/WEB-INF/jspf/comm.jspf
+++ b/src/main/webapp/WEB-INF/jspf/comm.jspf
@@ -11,10 +11,10 @@
     String now = df.format(d);
 %>
 <%--<!-- jquery -->--%>
-<link rel="stylesheet" href="${path}/static/css/comm.css"/>
+<link rel="stylesheet" href="${path}/static/css/comm.css?t=2020-08-18"/>
 <%--<!-- 引入bootstrap样式 -->--%>
 <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/bootstrap.min.css"/>
-<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css"/>
+<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css?t=2020-08-18"/>
 <link href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.css" rel="stylesheet">
 <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-toastr/toastr.min.css"/>
 <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/fileinput.min.css">
@@ -33,7 +33,7 @@
 <script type="text/javascript" src="${path}/static/js/jquery-ui.min.js"></script>
 <script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
 <script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/locales/bootstrap-datepicker.zh-CN.min.js"></script>
-<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js"></script>
+<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js?t=2020-08-18"></script>
 <%--<!-- 引入中文语言包 -->--%>
 <script type="text/javascript"
         src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
@@ -56,4 +56,4 @@
 
 <script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/fileinput.min.js"></script>
 <script type="text/javascript" src="${path}/static/js/hospitalCommom/pinying.js"></script>
-<script type="text/javascript" src="${path}/static/js/comm.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="${path}/static/js/comm.js?t=2020-08-18"></script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 7321547..28f8538 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -154,10 +154,11 @@
         /**
          *多选下拉框
          */
-        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
-            width: 168px!important;
+        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+            width: 168px !important;
         }
-        .filter-option-inner-inner{
+
+        .filter-option-inner-inner {
             font-size: 12px;
         }
     </style>
@@ -174,188 +175,207 @@
 <input type="hidden" id="currentRole">
 <!--当前操作角色-->
 <input type="hidden" id="checker">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             出院浏览
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="name">主管医生:</label>
-                <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25" placeholder="请输入主管医生姓名">
-            </div>
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName" title="请输入科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDateTo" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
-                </select>
-            </div>
-            <div class="form-group divCss">
-                <label>审核状态:</label>
-                <select class="input-sm form-control" id="archivestate1">
-                    <option value="">全部</option>
-                    <option value="0">待审核</option>
-                    <option value="1">已审核</option>
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <div class=table-responsive">
-        <table id="table" class="table text-nowrap table-striped"></table>
-    </div>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                    <option value="all">导出全部数据</option>
-                    <option value="selected">导出选中数据</option>
-                </select>
-            </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
-        </div>
-    </div>
-</div>
-<!-- 模态框3（Modal）查看档案 -->
-<div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    &times;
-                </button>
-                <h4 class="modal-title">
-                    病历清单
-                </h4>
-            </div>
-            <div class="modal-body divCss2">
-                <!--通过审批且未过期的patientId集合-->
-                <form class="form-horizontal" id="form1">
-                    <div id="masterId"></div>
-                    <div class="row">
-                        <div class="row divCss3">病历信息</div>
-                        <div class="row divCss2">
-                            <div class="col-sm-5" hidden>
-                                病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
-                            </div>
-                            <div class="col-sm-4">
-                                住院号：<label id="inLab" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-4">
-                                住院次数：<label id="inTimeLab" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-3">
-                                姓名：<label id="nameLab" class="labCss"></label>
-                            </div>
-                        </div>
-                        <div class="row divCss2">
-
-                            <div class="col-sm-4"><input type="text" id="outDateLab" hidden/>
-                                入院科室：<label id="deptToLab" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-4">
-                                入院日期：<label id="inDateLab" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-4" id="recallDiv">
-                                缺陷管理:
-                                <button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">缺陷查看</button>
-                            </div>
-                        </div>
-                        <div class="row divCss2">
-                            <div class="col-sm-4"><input type="text" id="outDateLab1" hidden/>
-                                出院科室：<label id="deptToLab1" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-4">
-                                出院日期：<label id="inDateLab1" class="labCss"></label>
-                            </div>
-                            <div class="col-sm-4">
-                                完整性审核：<span id="wzContent"></span>
-                            </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="name">主管医生:</label>
+                        <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
+                               placeholder="请输入主管医生姓名">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName" title="请输入科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
                         </div>
                     </div>
-                    <div class="divCss4"></div>
-                    <div class="row">
-                        <div class="row divCss3 ">病历清单</div>
-                        <div class="col-sm-3 divCss2" style="width: 25%">
-                            <div class="row titleCss"></div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>审核状态:</label>
+                        <select class="input-sm form-control" id="archivestate1">
+                            <option value="">全部</option>
+                            <option value="0">待审核</option>
+                            <option value="1">已审核</option>
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <div class=table-responsive">
+                <table id="table" class="table text-nowrap table-striped"></table>
+            </div>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                            <option value="all">导出全部数据</option>
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
+            </div>
+        </div>
+        <!-- 模态框3（Modal）查看档案 -->
+        <div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel"
+             aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                            &times;
+                        </button>
+                        <h4 class="modal-title">
+                            病历清单
+                        </h4>
+                    </div>
+                    <div class="modal-body divCss2">
+                        <!--通过审批且未过期的patientId集合-->
+                        <form class="form-horizontal" id="form1">
+                            <div id="masterId"></div>
                             <div class="row">
-                                <div class="col-sm-9">
-                                    <input type="text" id="key" value="" class="input-sm form-control empty"
-                                           placeholder="分段名称"/>
+                                <div class="row divCss3">病历信息</div>
+                                <div class="row divCss2">
+                                    <div class="col-sm-5" hidden>
+                                        病案号：<label id="idLab" class="labCss"></label><label id="assortId"
+                                                                                            hidden></label>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        住院号：<label id="inLab" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        住院次数：<label id="inTimeLab" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-3">
+                                        姓名：<label id="nameLab" class="labCss"></label>
+                                    </div>
                                 </div>
-                                <button type="button" class="btn btn-primary btn-sm" id="searchBtn1">查询</button>
-                            </div>
-                            <div class="row">
-                                <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="expandAll();">
-                                    全部展开
-                                </button>
-                                <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="collapseAll();">
-                                    全部收缩
-                                </button>
-                            </div>
-                            <div class="row">
-                                <!--树-->
-                                <div class="zTreeDemo" id="foo">
-                                    <ul id="ztree" class="ztree"></ul>
+                                <div class="row divCss2">
+
+                                    <div class="col-sm-4"><input type="text" id="outDateLab" hidden/>
+                                        入院科室：<label id="deptToLab" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        入院日期：<label id="inDateLab" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-4" id="recallDiv">
+                                        缺陷管理:
+                                        <button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">缺陷查看
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="row divCss2">
+                                    <div class="col-sm-4"><input type="text" id="outDateLab1" hidden/>
+                                        出院科室：<label id="deptToLab1" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        出院日期：<label id="inDateLab1" class="labCss"></label>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        完整性审核：<span id="wzContent"></span>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="col-sm-8 divCss5" style="width: 73%">
-                            <div class="row btnGroupCss">
-                                <button type="button" class="btn btn-danger btn-sm" id="checkSuccessBtn">查看完整性</button>
-                                <button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件</button>
-                                <button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
-                                <button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>
-                                <button type="button" class="btn btn-warning btn-sm" id="updateStateBtn">选中作废</button>
-                                <button type="button" class="btn btn-primary btn-sm" id="updateStateBtn2">选中使用</button>
-                            </div>
+                            <div class="divCss4"></div>
                             <div class="row">
-                                <!--数据表格-->
-                                <table id="table2" class="table text-nowrap table-striped"></table>
-                                <div>
+                                <div class="row divCss3 ">病历清单</div>
+                                <div class="col-sm-3 divCss2" style="width: 25%">
+                                    <div class="row titleCss"></div>
+                                    <div class="row">
+                                        <div class="col-sm-9">
+                                            <input type="text" id="key" value="" class="input-sm form-control empty"
+                                                   placeholder="分段名称"/>
+                                        </div>
+                                        <button type="button" class="btn btn-primary btn-sm" id="searchBtn1">查询</button>
+                                    </div>
+                                    <div class="row">
+                                        <button type="button" class="btn  btn-success btn-sm treeBtn"
+                                                onclick="expandAll();">
+                                            全部展开
+                                        </button>
+                                        <button type="button" class="btn  btn-success btn-sm treeBtn"
+                                                onclick="collapseAll();">
+                                            全部收缩
+                                        </button>
+                                    </div>
+                                    <div class="row">
+                                        <!--树-->
+                                        <div class="zTreeDemo" id="foo">
+                                            <ul id="ztree" class="ztree"></ul>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-8 divCss5" style="width: 73%">
+                                    <div class="row btnGroupCss">
+                                        <button type="button" class="btn btn-danger btn-sm" id="checkSuccessBtn">查看完整性
+                                        </button>
+                                        <button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件
+                                        </button>
+                                        <button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
+                                        <button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>
+                                        <button type="button" class="btn btn-warning btn-sm" id="updateStateBtn">选中作废
+                                        </button>
+                                        <button type="button" class="btn btn-primary btn-sm" id="updateStateBtn2">选中使用
+                                        </button>
+                                    </div>
+                                    <div class="row">
+                                        <!--数据表格-->
+                                        <table id="table2" class="table text-nowrap table-striped"></table>
+                                        <div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        </form>
                     </div>
-                </form>
+                </div>
             </div>
         </div>
     </div>
@@ -379,7 +399,8 @@
                     <div class="form-group"><input id="fileUrlInp" hidden/>
                         <label class="col-sm-4 control-label">标题：</label>
                         <div class="col-sm-5">
-                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle" maxlength="100">
+                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle"
+                                   maxlength="100">
                         </div>
                         <div class="col-sm-1"></div>
                     </div>
@@ -397,7 +418,8 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">来源：</label>
                         <div class="col-sm-5">
-                            <input type="text" class="input-sm form-control" readonly id="inpSource" name="inpSource" maxlength="25">
+                            <input type="text" class="input-sm form-control" readonly id="inpSource" name="inpSource"
+                                   maxlength="25">
                         </div>
                         <div class="col-sm-1"></div>
                     </div>
@@ -533,7 +555,8 @@
 
                             </div>
                             <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6" cols="80" maxlength="500"></textarea>
+                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6" cols="80"
+                                                                                      maxlength="500"></textarea>
                             </div>
                         </div>
                     </div>
@@ -543,15 +566,22 @@
                         <div class="row divCss3 ">退回信息</div>
                         <div class="row divCss2">
                             <div class="row divCss2">
-                                <span style="vertical-align:center;">评分：</span><input id="score" type="number" class="input-sm " min="1"/> 分
+                                <span style="vertical-align:center;">评分：</span><input id="score" type="number"
+                                                                                      class="input-sm " min="1"/> 分
                             </div>
                             <div class="row divCss22" style="margin-left: 0!important;">
                                 <span>退给角色：</span>
-                                <label id="returnDoctor" style="display: none"><input type="checkbox" name="returntoRole" class="returntoRole" value="DOCTOR"/>医生</label>
-                                <label id="returnNurse" style="display: none"><input type="checkbox" name="returntoRole" value="NURSE"/>护士</label>
+                                <label id="returnDoctor" style="display: none"><input type="checkbox"
+                                                                                      name="returntoRole"
+                                                                                      class="returntoRole"
+                                                                                      value="DOCTOR"/>医生</label>
+                                <label id="returnNurse" style="display: none"><input type="checkbox" name="returntoRole"
+                                                                                     value="NURSE"/>护士</label>
                             </div>
                             <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6" cols="80" maxlength="500"></textarea>
+                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6"
+                                                                                      cols="80"
+                                                                                      maxlength="500"></textarea>
                             </div>
                         </div>
                     </div>
@@ -678,7 +708,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-12"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-18"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
index 6111610..8540fc0 100644
--- a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
+++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
@@ -38,17 +38,16 @@
         }
 
         .zTreeDemo {
-            margin-left: 38px;
-            height: calc(100vh - 130px);
+            height: calc(100vh - 162px);
             overflow: auto;
         }
 
-        .content {
-            margin-left: 20px;
-            background-color: #fff;
-            min-height:100%;
-            height: auto;
-            padding-top: 0;
+        .box {
+            margin-bottom: 0;
+        }
+
+        #form1 {
+            min-height: calc(100vh - 126px);
         }
 
         .row {
@@ -80,183 +79,217 @@
     </style>
 </head>
 <body style="background-color: #c1d7e3">
-<div>
-    <div class="col-md-3" style="background-color: #fff;">
-        <div class="row titleCss">
-            &nbsp;字典列表
-        </div>
-        <div class="form-inline ">
-            <input type="text" id="key" value="" class="input-sm " style="width:70%" placeholder="字典名称" maxlength="25"/>
-            <button type="button" class="btn btn-primary btn-sm" id="searchBtn">查询</button>
-        </div>
-        <div class="row" style="margin-left: 5px;">
-            <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="expandAll();">全部展开</button>
-            <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="collapseAll();">全部收缩</button>
-        </div>
-        <div class="row">
-            <!--树-->
-            <div class="zTreeDemo">
-                <ul id="ztree" class="ztree" style="margin-left:-18px;"></ul>
-            </div>
-        </div>
-    </div>
-    <!--内容-->
-    <div class="col-md-8 content" STYLE="float:left;">
-        <div class="row titleCss2">
-            &nbsp;字典信息
-        </div>
-        <form id="form1" style="margin-left: 150px">
-            <div style="text-align: right;margin-right: 200px;">
-                <button type="button" class="btn btn-info  btn-sm" id="addBtn" style="display:none">添加叶子</button>
-                <%--<button type="button" class="btn btn-warning  btn-sm" id="addTypeBtn">添加类别</button>--%>
-            </div>
-            <div id="allTypeDiv">
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">类别代码：</label>
-                        <div class="col-sm-4"><input type="text" hidden id="id" name="id" value=""/>
-                            <input type="text" class="input-sm form-control" id="typecode" name="typeFlag" maxlength="25"/>
-                        </div>
-                        <div class="col-sm-1"></div>
-                    </div>
+<div class="mainBody">
+    <div class="row" style="margin: 0">
+        <div class="col-md-3">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">字典列表</h3>
                 </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">类别名称：</label>
-                        <div class="col-sm-4">
-                            <input type="text" class="input-sm form-control" id="typename" name="typename" maxlength="25"/>
-                        </div>
-                        <div class="col-sm-1"></div>
+                <div class="box-body">
+                    <div class="form-inline">
+                        <input type="text" id="key" value="" class="input-sm " style="width:70%" placeholder="字典名称"
+                               maxlength="25"/>
+                        <button type="button" class="btn btn-primary btn-sm" id="searchBtn">查询</button>
                     </div>
-                </div>
-                <div id="subTypeDiv">
                     <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">代码：</label>
-                            <div class="col-sm-4">
-                                <input type="text" class="input-sm form-control" id="code" name="code" maxlength="25"/>
-                            </div>
-                            <div class="col-sm-1"></div>
-                        </div>
+                        <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="expandAll();">全部展开
+                        </button>
+                        <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="collapseAll();">全部收缩
+                        </button>
                     </div>
                     <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">名称：</label>
-                            <div class="col-sm-4">
-                                <input type="text" class="input-sm form-control" id="name" name="name" maxlength="25"/>
+                        <!--树-->
+                        <div class="col-md-12">
+                            <div class="zTreeDemo">
+                                <ul id="ztree" class="ztree" style="margin-left:-18px;"></ul>
                             </div>
-                            <div class="col-sm-1"></div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">拼音码：</label>
-                            <div class="col-sm-4">
-                                <input type="text" readonly class="input-sm form-control" id="pyCode" name="pyCode" maxlength="25"/>
-                            </div>
-                            <div class="col-sm-1"></div>
-                        </div>
+                </div>
+            </div>
+        </div>
+        <!--内容-->
+        <div class="col-md-9">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">字典信息</h3>
+                </div>
+                <div class="box-body">
+                    <div style="text-align: right;margin-right: 200px;">
+                        <button type="button" class="btn btn-info  btn-sm" id="addBtn" style="display:none">添加叶子
+                        </button>
+                        <%--<button type="button" class="btn btn-warning  btn-sm" id="addTypeBtn">添加类别</button>--%>
                     </div>
-                    <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">五笔码：</label>
-                            <div class="col-sm-4">
-                                <input type="text" readonly class="input-sm form-control" id="wbCode" name="wbCode" maxlength="25"/>
+                    <form id="form1" style="margin-left: 150px">
+                        <div id="allTypeDiv">
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">类别代码：</label>
+                                    <div class="col-sm-4"><input type="text" hidden id="id" name="id" value=""/>
+                                        <input type="text" class="input-sm form-control" id="typecode" name="typeFlag"
+                                               maxlength="25"/>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
                             </div>
-                            <div class="col-sm-1"></div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">邮编：</label>
-                            <div class="col-sm-4">
-                                <input type="text" class="input-sm form-control" id="zipCode" name="zipCode" maxlength="20"/>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">类别名称：</label>
+                                    <div class="col-sm-4">
+                                        <input type="text" class="input-sm form-control" id="typename" name="typename"
+                                               maxlength="25"/>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
                             </div>
-                            <div class="col-sm-1"></div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">国标码：</label>
-                            <div class="col-sm-4">
-                                <input type="text" class="input-sm form-control" id="gbCode" name="gbCode" maxlength="20"/>
+                            <div id="subTypeDiv">
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">代码：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" class="input-sm form-control" id="code" name="code"
+                                                   maxlength="25"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">名称：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" class="input-sm form-control" id="name" name="name"
+                                                   maxlength="25"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">拼音码：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" readonly class="input-sm form-control" id="pyCode"
+                                                   name="pyCode" maxlength="25"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">五笔码：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" readonly class="input-sm form-control" id="wbCode"
+                                                   name="wbCode" maxlength="25"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">邮编：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" class="input-sm form-control" id="zipCode" name="zipCode"
+                                                   maxlength="20"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">国标码：</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" class="input-sm form-control" id="gbCode" name="gbCode"
+                                                   maxlength="20"/>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
+
+                                <%--<div class="row">--%>
+                                <%--<div class="form-group">--%>
+                                <%--<label class="col-sm-3 control-label">父级：</label>--%>
+                                <%--<div class="col-sm-3">--%>
+                                <%--<select id="parentId" class="input-sm form-control">                --%>
+                                <%--&lt;%&ndash;<option value="1">有效</option>                                           &ndash;%&gt;--%>
+                                <%--&lt;%&ndash;<option value="0">无效</option>&ndash;%&gt;--%>
+                                <%--</select>--%>
+                                <%--</div>--%>
+                                <%--<div class="col-sm-1"></div>--%>
+                                <%--</div>--%>
+                                <%--</div>--%>
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">报表上可见：</label>
+                                        <div class="col-sm-4">
+                                            <select id="flag" class="input-sm form-control">
+                                                <option value="">不可见</option>
+                                                <option value="1">可见</option>
+                                            </select>
+                                        </div>
+                                        <div class="col-sm-1"></div>
+                                    </div>
+                                </div>
                             </div>
-                            <div class="col-sm-1"></div>
-                        </div>
-                    </div>
-
-                    <%--<div class="row">--%>
-                    <%--<div class="form-group">--%>
-                    <%--<label class="col-sm-3 control-label">父级：</label>--%>
-                    <%--<div class="col-sm-3">--%>
-                    <%--<select id="parentId" class="input-sm form-control">                --%>
-                    <%--&lt;%&ndash;<option value="1">有效</option>                                           &ndash;%&gt;--%>
-                    <%--&lt;%&ndash;<option value="0">无效</option>&ndash;%&gt;--%>
-                    <%--</select>--%>
-                    <%--</div>--%>
-                    <%--<div class="col-sm-1"></div>--%>
-                    <%--</div>--%>
-                    <%--</div>--%>
-                    <div class="row">
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">报表上可见：</label>
-                            <div class="col-sm-4">
-                                <select id="flag" class="input-sm form-control">
-                                    <option value="">不可见</option>
-                                    <option value="1">可见</option>
-                                </select>
+                            <div class="row" id="parentDiv">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">上级目录</label>
+                                    <div class="col-sm-4">
+                                        <input id="parentId" name="parentId" class="input-sm form-control"
+                                               style="width: 265px;"/>
+                                    </div>
+                                </div>
+                                <%--<input id="ts_input">--%>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">是否有效：</label>
+                                    <div class="col-sm-4">
+                                        <select id="effective" class="input-sm form-control">                
+                                            <option value="1">有效</option>
+                                                           
+                                            <option value="0">无效</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">说明：</label>
+                                    <div class="col-sm-6">
+                                    <textarea class="input-sm form-control" rows="5" id="cComment" name="cComment"
+                                              maxlength="25"></textarea>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">备注：</label>
+                                    <div class="col-sm-6">
+                                    <textarea class="input-sm form-control" rows="5" id="remark" name="recallReason"
+                                              maxlength="25"></textarea>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <div class="col-sm-3"></div>
+                                    <div class="col-sm-9">
+                                        <button type="button" class="btn btn-danger btn-sm" id="delBtn">删除类别</button>
+                                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:90px"
+                                                id="saveBtn">
+                                            保存类别
+                                        </button>
+                                    </div>
+                                </div>
                             </div>
-                            <div class="col-sm-1"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row" id="parentDiv">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">上级目录</label>
-                        <div class="col-sm-4">
-                            <input id="parentId" name="parentId" class="input-sm form-control" style="width: 265px;"/>
-                        </div>
-                    </div>
-                    <%--<input id="ts_input">--%>
-                </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">是否有效：</label>
-                        <div class="col-sm-4">
-                            <select id="effective" class="input-sm form-control">                
-                                <option value="1">有效</option>
-                                               
-                                <option value="0">无效</option>
-                            </select>
-                        </div>
-                        <div class="col-sm-1"></div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">说明：</label>
-                        <div class="col-sm-6">
-                            <textarea class="input-sm form-control" rows="5" id="cComment" name="cComment" maxlength="25"></textarea>
-                        </div>
-                        <div class="col-sm-1"></div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">备注：</label>
-                        <div class="col-sm-6">
-                            <textarea class="input-sm form-control" rows="5" id="remark" name="recallReason" maxlength="25"></textarea>
                         </div>
-                        <div class="col-sm-1"></div>
-                    </div>
-                </div>
-                <div style="margin-left:30px;margin-top: 50px;">
-                    <button type="button" class="btn btn-danger btn-sm" id="delBtn">删除类别</button>
-                    <button type="button" class="btn btn-primary btn-sm" style="margin-left:37%" id="saveBtn">保存类别
-                    </button>
+                    </form>
                 </div>
             </div>
-        </form>
+        </div>
     </div>
 </div>
 <script type="text/javascript">
@@ -497,7 +530,6 @@
                     //$("#addTypeBtn").show();
                     $("#parentDiv").hide();
                     emptyEntity(1);
-
                 }
             }
         }
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
index c2ea39a..2fe629f 100644
--- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
+++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
@@ -52,383 +52,96 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             缺陷列表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDateTo" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss">
-                <label for="archivestate">归档状态 :</label>
-                <select class="input-sm form-control" id="archivestate">
-                    <option value="">全部</option>
-                    <option value="0">未归档</option>
-                    <option value="1">已归档</option>
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table  text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                   
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss">
+                        <label for="archivestate">归档状态 :</label>
+                        <select class="input-sm form-control" id="archivestate">
+                            <option value="">全部</option>
+                            <option value="0">未归档</option>
+                            <option value="1">已归档</option>
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table  text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                           
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-</div>
+</body>
 <script>
     var path = "${path}";
-    $('.bs-select').selectpicker({});
-    $('#deptDiv').selectpicker({
-        size: 4
-    });
-    var tipLoad = 1;
-
-    //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
-    function DoOnCellHtmlData(cell, row, col, data) {
-        if (row == 0) {
-            return data;
-        }
-        //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
-        if (col == 4 || col == 11 || col == 7) {
-            var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
-            var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
-            //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
-            if (typeof (title) != 'undefined') {
-                return title;
-            }
-        }
-        return data;
-    }
-
-    function initTable() {
-        if (tipLoad == 1) {
-            $("#table").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/fault/faultList", // 获取表格数据的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 则显示所有记录。
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-                showColumns: true,
-                toolbar: '#toolbar',//指定工具栏
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '---', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                //height: getHeight(219),     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                //是否显示导出按钮
-                showExport: true,
-                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
-                exportDataType: "basic",
-                //导出文件类型
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
-                exportOptions: {
-                    fileName: document.title
-                },
-                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 url = window.location.href;
-                    var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                    var len = ($("#deptName").val()).length;
-                    if (len > 0) {
-                        var deptNameT = $("#deptName").val();
-                        if (deptNameT.indexOf("") == -1) {
-                            deptName = $("#deptName").val().toString();
-                        }
-                    }
-                    var temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        order: params.order,      //排位命令（desc，asc）
-                        startDate: $("#startDateTo").val(),
-                        endDate: $("#endDateTo").val(),
-                        inpNo: "" + $("#inpNo").val(),
-                        visitId: "" + $("#visitId").val(),
-                        name: "" + $("#name").val(),
-                        archivestate: "" + $("#archivestate").val(),
-                        deptName: deptName.toString(),
-                        isSearch: $("#isSearch").val()
-                    };
-                    return temp;
-                },
-                sortName: 'id', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'left',
-                    valign: 'middle',
-                },
-                    {
-                        title: '序号',
-                        field: 'id',
-                        align: 'center',
-                        valign: 'middle',
-                        //field: 'ID',
-                        // visible: false,
-                        formatter: function (value, row, index) {
-                            return index + 1;
-                        }
-                    },
-                    {
-                        title: '住院号',
-                        field: 'inpNo',
-                        valign: 'middle',
-                        //sortable: true,
-                    },
-                    {
-                        title: '住院次数',
-                        field: 'visitId',
-                        valign: 'middle',
-                        align: 'center'
-                    },
-                    {
-                        title: '姓名',
-                        field: 'name',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '出院科室',
-                        field: 'deptName',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '出院日期',
-                        field: 'dischargeDateTime',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return operDisDate(value);
-                        }
-                    },
-                    {
-                        title: '归档状态',
-                        field: 'archivestate',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            //在院  未归档  归档中  初审 已归档 已认证 复审退回
-                            var a = '';
-                            if (value == "已归档") {
-                                a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
-                            } else {
-                                a = '<span style="color:#c0c0c0;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未归档</span>';
-                            }
-                            return a;
-                        }
-                    },
-                    {
-                        field: 'score',
-                        title: '评分(分)',
-                        //sortable: true,
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return value;
-                            //return changeDateFormat(value)
-                        }
-                    },
-                    {
-                        field: 'backContent',
-                        title: '退回内容',
-                        formatter: function (value, row, index) {
-                            return value;
-                            //return changeDateFormat(value)
-                        }
-                    },
-                    {
-                        field: 'assortId',
-                        title: '缺陷选项',
-                        valign: 'middle',
-                        formatter: function (value) {
-                            return '<p class="hidden-xs" title="' + value + '">' + value + '</p>';
-                        }
-                    },
-                    {
-                        field: 'content',
-                        title: '缺陷自定内容',
-                        valign: 'middle',
-                        formatter: function (value) {
-                            return value;
-                        }
-                    },
-                    {
-                        field: 'createTime',
-                        title: '创建时间',
-                        valign: 'middle',
-                        formatter: function (value) {
-                            return value;
-                            //return changeDateFormat(value)
-                        }
-                    },
-                    {
-                        field: 'creater',
-                        title: '创建人',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return value;
-                        }
-                    },
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    //console.info("加载成功");
-                    $(".page-list").show();
-                    tipLoad = 0;
-                    reloadTableHeight("table");
-                },
-                onLoadError: function () {  //加载失败时执行
-                    //console.info("加载数据失败");
-                    tipLoad = 0;
-                }
-            });
-        }
-    }
-
-    $(function () {
-        getDept();
-        var url = window.location.href;
-        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-        if (index != null && index != "" && index.indexOf("excel") != -1) {
-            $("#excelBtn").show();
-            $("#toolbar").show();
-        } else {
-            $("#excelBtn").hide();
-            $(".columns-right").hide();
-        }
-        var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-        var deptArr = deptAdmissionTo.split(',');
-        //var n = (deptAdmissionTo.split(',')).length ;
-        if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
-            $('#deptDiv').show();
-        } else {
-            $('#deptDiv').hide();
-        }
-    });
-    initTable();
-    //2.初始化select的change事件
-    $("#sel_exportoption").change(function () {
-        $('#table').bootstrapTable('refreshOptions', {
-            exportDataType: $(this).val()
-        });
-    });
-    $("#refreshBtn").click(function () {
-        //刷新
-        $('#table').bootstrapTable('refresh');
-    });
-
-    //导出excel功能
-    $("#excelBtn").click(function () {
-        var inpNo = $("#inpNo").val();
-        var visitId = $("#visitId").val();
-        var name = $("#name").val();
-        var startDate = $("#startDateTo").val();
-        var endDate = $("#endDateTo").val();
-        var archivestate = $("#archivestate").val();
-
-        var url = window.location.href;
-        var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-        var len = ($("#deptName").val()).length;
-        if (len > 0) {
-            var deptNameT = $("#deptName").val();
-            if (deptNameT.indexOf("") == -1) {
-                deptName = $("#deptName").val().toString();
-            }
-        }
-        var isSearch = $("#isSearch").val();
-        var url = "${path}/fault/exportExcel";
-        post(url, {
-            "inpNo": inpNo,
-            "visitId": visitId,
-            "name": name,
-            "deptName": deptName,
-            "startDate": startDate,
-            "endDate": endDate,
-            "isSearch": isSearch,
-            "archivestate": archivestate
-        });
-    });
 </script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
+<script src="${path}/static/js/faultList/faultList.js?time=2020-08-18"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp
index 65ea335..04944b0 100644
--- a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp
@@ -24,16 +24,16 @@
         }
 
         .zTreeDemo {
-            margin-left: 38px;
-            height: calc(100vh - 130px);
+            height: calc(100vh - 162px);
             overflow: auto;
         }
 
-        .content {
-            margin-left: 20px;
-            background-color: #fff;
-            height:100%;
-            padding-top: 0;
+        .box {
+            margin-bottom: 0;
+        }
+
+        #form1 {
+            min-height: calc(100vh - 96px);
         }
 
         .row {
@@ -42,7 +42,7 @@
 
         .control-label {
             margin-right: -25px;
-            margin-top:5px;
+            margin-top: 5px;
         }
 
         .left {
@@ -51,103 +51,128 @@
     </style>
 </head>
 <body style="background-color: #c1d7e3">
-<div>
-    <div class="col-md-3" style="background-color: #fff;">
-        <div class="row titleCss">
-            &nbsp;缺陷类别列表
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <input type="text" id="key" value="" class="input-sm empty left" placeholder="缺陷类别名称"
-                       style="width:70%" maxlength="25"/>
-                <button type="button" class="btn btn-primary btn-sm left" id="searchBtn" style="margin-left: 5px">查询
-                </button>
-            </div>
-        </div>
-        <div class="row">
-            <button type="button" class="btn  btn-success btn-sm treeBtn left" onclick="expandAll();">全部展开</button>
-            <button type="button" class="btn  btn-success btn-sm treeBtn left" onclick="collapseAll();">全部收缩</button>
-        </div>
-        <div class="row">
-            <!--树-->
-            <div class="zTreeDemo">
-                <ul id="ztree" class="ztree"></ul>
-            </div>
-        </div>
-    </div>
-    <!--内容-->
-    <div class="col-md-8 content">
-        <div class="row titleCss">
-            &nbsp;缺陷类别信息
-        </div>
-        <div style="text-align: right;margin-right: 200px">
-            <div id="addTypeDiv">
-                <button type="button" class="btn btn-warning  btn-sm" id="addBtn">添加类别</button>
-            </div>
-        </div>
-        <div id="contextDiv" style="display: none">
-            <form id="form1" style="margin-left: 150px">
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">类别代码：</label>
-                        <div class="col-sm-4"><input type="text" hidden id="id" name="id">
-                            <input type="text" class="input-sm form-control" id="typeFlag" name="typeFlag" maxlength="16">
-                        </div>
-                        <div class="col-sm-1"></div>
-                    </div>
+<div class="mainBody">
+    <div class="row" style="margin: 0">
+        <div class="col-md-3">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">缺陷类别列表</h3>
                 </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">类别名称：</label>
-                        <div class="col-sm-4">
-                            <input type="text" class="input-sm form-control" id="typeName" name="typeName" maxlength="25">
-                        </div>
-                        <div class="col-sm-1"></div>
+                <div class="box-body">
+                    <div class="form-inline">
+                        <input type="text" id="key" value="" class="input-sm empty" placeholder="缺陷类别名称"
+                               style="width:70%" maxlength="25"/>
+                        <button type="button" class="btn btn-primary btn-sm" id="searchBtn"
+                                style="margin-left: 5px">查询
+                        </button>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">类别排序：</label>
-                        <div class="col-sm-4">
-                            <input type="number" class="input-sm form-control" id="typeSort" name="typeSort" min="0" maxlength="2">
-                        </div>
-                        <div class="col-sm-1"></div>
+                    <div class="row">
+                        <button type="button" class="btn  btn-success btn-sm treeBtn left" onclick="expandAll();">全部展开
+                        </button>
+                        <button type="button" class="btn  btn-success btn-sm treeBtn left" onclick="collapseAll();">全部收缩
+                        </button>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">是否有效：</label>
-                        <div class="col-sm-3">
-                            <select id="effective" class="input-sm form-control">                
-                                <option value="1">有效</option>
-                                               
-                                <option value="0">无效</option>
-                            </select>
+                    <div class="row">
+                        <!--树-->
+                        <div class="col-md-12">
+                            <div class="zTreeDemo">
+                                <ul id="ztree" class="ztree"></ul>
+                            </div>
                         </div>
-                        <div class="col-sm-1"></div>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">备注：</label>
-                        <div class="col-sm-6">
-                            <textarea class="input-sm form-control" rows="5" id="remark" name="recallReason" maxlength="50"></textarea>
+            </div>
+        </div>
+        <!--内容-->
+        <div class="col-md-9">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">缺陷类别信息</h3>
+                </div>
+                <div class="box-body" style="height: calc(100vh - 62px);">
+                    <div style="text-align: right;margin-right: 200px">
+                        <div id="addTypeDiv">
+                            <button type="button" class="btn btn-warning  btn-sm" id="addBtn">添加类别</button>
                         </div>
-                        <div class="col-sm-1"></div>
+                    </div>
+                    <div id="contextDiv" style="display: none">
+                        <form id="form1" style="margin-left: 150px">
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">类别代码：</label>
+                                    <div class="col-sm-4"><input type="text" hidden id="id" name="id">
+                                        <input type="text" class="input-sm form-control" id="typeFlag" name="typeFlag"
+                                               maxlength="16">
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">类别名称：</label>
+                                    <div class="col-sm-4">
+                                        <input type="text" class="input-sm form-control" id="typeName" name="typeName"
+                                               maxlength="25">
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">类别排序：</label>
+                                    <div class="col-sm-4">
+                                        <input type="number" class="input-sm form-control" id="typeSort" name="typeSort"
+                                               min="0" maxlength="2">
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">是否有效：</label>
+                                    <div class="col-sm-3">
+                                        <select id="effective" class="input-sm form-control">                
+                                            <option value="1">有效</option>
+                                                           
+                                            <option value="0">无效</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">备注：</label>
+                                    <div class="col-sm-6">
+                                    <textarea class="input-sm form-control" rows="5" id="remark" name="recallReason"
+                                              maxlength="50"></textarea>
+                                    </div>
+                                    <div class="col-sm-1"></div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <div class="col-sm-3"></div>
+                                    <div class="col-sm-9">
+                                        <button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
+                                        <button type="button" class="btn btn-danger btn-sm" style="margin-left: 90px"
+                                                id="delBtn">
+                                            删除类别
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
                     </div>
                 </div>
-                <div style="margin-left:93px;margin-top: 50px;">
-                    <button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
-                    <button type="button" class="btn btn-danger btn-sm" style="margin-left: 30px" id="delBtn">删除类别
-                    </button>
-                </div>
-            </form>
+            </div>
         </div>
     </div>
 </div>
 <script type="text/javascript">
     var zNodes = [];
     var nodeList = [];
+
     function initTree() {
         zNodes = [];
         //获取所有缺陷类别列表
diff --git a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp
index 55e69eb..80d64db 100644
--- a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp
@@ -43,85 +43,94 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             审核流程明细
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>审核日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss8">
-                <label>审核姓名:</label>
-                <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control" id="startTime2" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime2" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>患者姓名:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label>&emsp;住院号:</label>
-                <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-                <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
             </div>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-bordered"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>审核日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>审核姓名:</label>
+                        <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime2" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime2" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>患者姓名:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>&emsp;住院号:</label>
+                        <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                        <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    </div>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-bordered"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh" title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh" title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/flowInfo/flowInfoList.js?time=2020-08-12"></script>
+<script src="${path}/static/js/flowInfo/flowInfoList.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
index 5b3b5b2..0c274df 100644
--- a/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
+++ b/src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp
@@ -42,96 +42,105 @@
 </head>
 
 <body>
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             节假日设置
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 5px!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>设置日期:</label>
-                <div class="input-daterange input-group">
-                    <input type="text" class="input-sm form-control" id="startTime2"  maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime2"  maxlength="10" autocomplete="off"/>
-                </div>
             </div>
         </div>
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>勾选星期:</label>
-                <div class="input-daterange input-group">
-                    <input type="checkbox" class="week" value="1"/>周一
-                    <input type="checkbox" class="week" value="2"/>周二
-                    <input type="checkbox" class="week" value="3"/>周三
-                    <input type="checkbox" class="week" value="4"/>周四
-                    <input type="checkbox" class="week" value="5"/>周五
-                    <input type="checkbox" class="week" value="6"/>周六
-                    <input type="checkbox" class="week" value="0"/>周天
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 5px!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>设置日期:</label>
+                        <div class="input-daterange input-group">
+                            <input type="text" class="input-sm form-control" id="startTime2" maxlength="10"
+                                   autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime2" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
                 </div>
-                <div class="input-daterange input-group" style="margin-left: 40px">
-                    <input type="checkbox" onclick="selectAll()" id="select"/>全选
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>勾选星期:</label>
+                        <div class="input-daterange input-group">
+                            <input type="checkbox" class="week" value="1"/>周一
+                            <input type="checkbox" class="week" value="2"/>周二
+                            <input type="checkbox" class="week" value="3"/>周三
+                            <input type="checkbox" class="week" value="4"/>周四
+                            <input type="checkbox" class="week" value="5"/>周五
+                            <input type="checkbox" class="week" value="6"/>周六
+                            <input type="checkbox" class="week" value="0"/>周天
+                        </div>
+                        <div class="input-daterange input-group" style="margin-left: 40px">
+                            <input type="checkbox" onclick="selectAll()" id="select"/>全选
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <div class="input-daterange input-group">
-                    <button type="button" class="btn btn-primary btn-sm divCss10" id="saveSet">设为工作日</button>
-                    <button type="button" class="btn btn-danger btn-sm divCss10" id="saveHolidaySet">设为非工作日</button>
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <div class="input-daterange input-group">
+                            <button type="button" class="btn btn-primary btn-sm divCss10" id="saveSet">设为工作日</button>
+                            <button type="button" class="btn btn-danger btn-sm divCss10" id="saveHolidaySet">设为非工作日
+                            </button>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-    </form>
-    <hr>
-    <form style="margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>查询日期:</label>
-                <div class="input-daterange input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="startTime1" id="startTime1" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="endTime1" id="endTime1" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>是否工作日:</label>
-                <select class="input-sm form-control" id="flag">
-                    <option value="">全部</option>
-                    <option value="1">工作日</option>
-                    <option value="2">非工作日</option>
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+            </form>
+            <hr>
+            <form style="margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>查询日期:</label>
+                        <div class="input-daterange input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="startTime1" id="startTime1"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="endTime1" id="endTime1"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>是否工作日:</label>
+                        <select class="input-sm form-control" id="flag">
+                            <option value="">全部</option>
+                            <option value="1">工作日</option>
+                            <option value="2">非工作日</option>
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
 
-        </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                   
-                    <option value="selected">导出选中数据</option>
-                </select>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                           
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
 </body>
-<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-08-12"></script>
+<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
index 5953f53..d3f935d 100644
--- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
+++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
@@ -144,79 +144,87 @@
 <input type="hidden" id="isSearch" value="1">
 <!--当前操作角色-->
 <input type="hidden" id="checker">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             在院浏览
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="name">主管医生:</label>
-                <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25" placeholder="请输入主管医生姓名">
-            </div>
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>入院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName" title="请输入入院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss">
-                <label>入院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDateTo" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDateTo"  maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>入院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
-                </select>
             </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table  text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="name">主管医生:</label>
+                        <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
+                               placeholder="请输入主管医生姓名">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>入院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName" title="请输入入院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>入院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>入院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table  text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-
 <!-- 模态框3（Modal）查看档案 -->
 <div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
@@ -329,7 +337,8 @@
                     <div class="form-group"><input id="fileUrlInp" hidden/>
                         <label class="col-sm-4 control-label">标题：</label>
                         <div class="col-sm-5">
-                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle" maxlength="100">
+                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle"
+                                   maxlength="100">
                         </div>
                         <div class="col-sm-1"></div>
                     </div>
@@ -461,344 +470,8 @@
 </body>
 <script type="text/javascript">
     var path = "${path}";
-    //识别是否加载
-    var tipLoad = 1;
-    $(function () {
-        getChecker();
-        var url = window.location.href;
-        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-        if (index != null && index != "" && index.indexOf("excel") != -1) {
-            $("#excelBtn").show();
-            $("#toolbar").show();
-        } else {
-            $("#excelBtn").hide();
-            $(".columns-right").hide();
-        }
-        if (index != null && index != "" && index.indexOf("upload") != -1) {
-            $("#uploadBtn").show();
-        } else {
-            $("#uploadBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("pdf") != -1) {
-            $("#pdfBtn").show();
-        } else {
-            $("#pdfBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("pdf2") != -1) {
-            $("#pdfBtn2").show();
-        } else {
-            $("#pdfBtn2").hide();
-        }
-        if (index != null && index != "" && index.indexOf("cancelAll") != -1) {
-            $("#updateStateBtn").show();
-        } else {
-            $("#updateStateBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("useAll") != -1) {
-            $("#updateStateBtn2").show();
-        } else {
-            $("#updateStateBtn2").hide();
-        }
-        var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-        var deptArr = deptAdmissionTo.split(',');
-        if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
-            $('#deptDiv').show();
-        } else {
-            $('#deptDiv').hide();
-        }
-    });
-
-    function initTable() {
-        if (tipLoad == 1) {
-            $("#table").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/inHosp/inHospitalList", // 获取表格数据的url
-                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-                //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                striped: true,  //是否显示行间隔色
-                pagination: true, // 在表格底部显示分页组件，默认false
-                paginationShowPageGo: true,
-                pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-                showColumns: true,
-                toolbar: '#toolbar',//指定工具栏
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '---', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                //height: getHeight(220),     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                //是否显示导出按钮
-                showExport: true,
-                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
-                exportDataType: "basic",
-                //导出文件类型
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
-                exportOptions: {
-                    fileName: document.title
-                },
-                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 url = window.location.href;
-                    var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                    var len = ($("#deptName").val()).length;
-                    if (len > 0) {
-
-                        var deptName = $("#deptName").val();
-                        if (deptName.indexOf("") != -1) {
-                            if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                                deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-                            } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                                deptAdmissionTo = $("#deptAdmissionTo").val();
-                            }
-                        } else {
-                            deptAdmissionTo = $("#deptName").val().toString();
-                        }
-                    } else {
-                        if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                            deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-                        } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                            deptAdmissionTo = $("#deptAdmissionTo").val();
-                        }
-                    }
-                    var temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        order: params.order,      //排位命令（desc，asc）
-                        id: $("#id").val(),
-                        idNo: $("#idNo").val(),
-                        inpNo: "" + $("#inpNo").val(),
-                        visitId: "" + $("#visitId").val(),
-                        name: "" + $("#name").val(),
-                        //deptName: "" + $("#deptName").val(),
-                        archivestate: "在院",
-                        startDateTo: $("#startDateTo").val(),
-                        endDateTo: $("#endDateTo").val(),
-                        deptAdmissionTo: deptAdmissionTo,
-                        doctorInCharge: $("#doctorInCharge").val(),
-                        isSearch: $("#isSearch").val()
-                    };
-                    return temp;
-                },
-                sortName: 'id', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'center',
-                    valign: 'middle',
-
-                },
-                    {
-                        title: '住院号',
-                        field: 'inpNo',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '住院次数',
-                        field: 'visitId',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '姓名',
-                        field: 'name',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '性别',
-                        field: 'sex',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '身份证号',
-                        field: 'idNo',
-                        align: 'center',
-                        valign: 'middle',
-                        visible: false
-                    },
-                    {
-                        title: '当前科室',
-                        field: 'deptName',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '入院日期',
-                        field: 'admissionDateTime',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            return operDisDate(value);
-                        }
-                    },
-                    {
-                        title: '主管医生',
-                        field: 'doctorInCharge',
-                        align: 'left',
-                    },
-                    {
-                        title: '状态',
-                        field: 'archivestate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function () {
-                            //在院  未归档  归档中  初审 已归档 已认证
-                            return '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>在院</span>';
-                        }
-                    },
-                    {
-                        title: "操作",
-                        align: 'left',
-                        valign: 'middle',
-                        width: 80, // 定义列的宽度，单位为像素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("select") != -1) {
-                                //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                                html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看 </button>';// '<a href="javascript:;" class="delete">删除</a>';
-                            }
-                            return html;
-
-                        }, events: {
-                            'click .selInfo': function (e, value, row, index) {
-                                //查询是否医生或护士是否提交
-                                var result = 1;
-                                //result = selectHis(row);
-                                if (result == 1) {
-                                } else if (result == -1) {
-                                    toastr.warning("系统出错了请联系系统管理员");
-                                } else {
-                                    toastr.warning('医生或护士未提交数据，请稍后再试');
-                                }
-                                $('#selModal').modal({
-                                    backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                    keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                    show: true//弹出对话框
-                                });
-                                //删除缓存
-                                //删除病历清单分段树选中
-                                $("#assortId").html(0);
-                                //删除病历清单查看单个pdf复选框选中信息
-                                idArr = [];
-                                //同步
-                                $("#idLab").html(row.id);
-                                $("#nameLab").html(row.name);
-                                //入院
-                                if (row.admissionDateTime != null && row.admissionDateTime != '') {
-                                    $("#inDateLab").html(operDisTime(row.admissionDateTime));
-                                }
-                                $("#chargeLab").html(row.doctorInCharge);
-                                $("#deptToLab").html(row.deptAdmissionTo);
-                                $("#outHospLab").html(row.dischargeDisposition);
-                                //出院
-                                if (row.dischargeDateTime != null && row.dischargeDateTime != '') {
-                                    $("#inDateLab1").html(operDisTime(row.dischargeDateTime));
-                                }
-                                $("#deptToLab1").html(row.deptName);
-
-                                $("#inLab").html(row.inpNo);
-                                $("#inTimeLab").html(row.visitId);
-                                //入/出院年+出院月+住院号+住院次数
-                                var outDate = "";
-                                if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
-                                    outDate = row.dischargeDateTime.split("-");
-                                } else if (row.admissionDateTime != null && row.admissionDateTime == "") {
-                                    outDate = row.admissionDateTime.split("-");
-                                }
-                                $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
-                                initTree(row.id, $("#checker").val());
-                            }
-                        },
-                        cellStyle: function (value, row, index) {
-                            return {classes: 'success'}
-                        }
-                    }
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    // console.info("加载成功");
-                    $(".page-list").show();
-                    tipLoad = 0;
-                    reloadTableHeight("table");
-                },
-                onLoadError: function () {  //加载失败时执行
-                    //console.info("加载数据失败");
-                    tipLoad = 0;
-                }
-            });
-        }
-    }
-
-    //导出excel功能
-    $("#excelBtn").click(function () {
-        var doctorInCharge = $("#doctorInCharge").val();
-        var inpNo = $("#inpNo").val();
-        var visitId = $("#visitId").val();
-        var name = $("#name").val();
-        var startDateTo = $("#startDateTo").val();
-        var endDateTo = $("#endDateTo").val();
-        var url = window.location.href;
-        var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-        var len = ($("#deptName").val()).length;
-        if (len > 0) {
-            var deptName = $("#deptName").val();
-            if (deptName.indexOf("") != -1) {
-                if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                    deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-                } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                    deptAdmissionTo = $("#deptAdmissionTo").val();
-                }
-            } else {
-                deptAdmissionTo = $("#deptName").val().toString();
-            }
-        } else {
-            if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-            } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                deptAdmissionTo = $("#deptAdmissionTo").val();
-            }
-        }
-        var isSearch = $("#isSearch").val();
-        var url = "${path}/inHosp/exportExcel";
-        post(url, {
-            "doctorInCharge": doctorInCharge,
-            "inpNo": inpNo,
-            "visitId": visitId,
-            "name": name,
-            "deptAdmissionTo": deptAdmissionTo,
-            "deptName": deptName,
-            "startDateTo": startDateTo,
-            "endDateTo": endDateTo,
-            "isSearch": isSearch
-        });
-    });
 </script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
+<script src="${path}/static/js/inHospList/inHospList.js?time=2020-08-18"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index f2942e2..bc26dbb 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -169,10 +169,10 @@
                                                     }
                                                     var menuALi = '';
                                                     if(i == 1 && !faultModleSelected){
-                                                        menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,true);
+                                                        menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,true,i,j);
                                                         faultModleSelected = true;
                                                     }else{
-                                                        menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,false);
+                                                        menuALi = newAliFun(list[j].menuName, list[j].menuIcon, "/emr_medical_record" + list[j].menuUrl + "?num=" + str + "&depts=" + depts,false,i,j);
                                                     }
                                                     menuAUL.append(menuALi);
                                                     mulLi.append(menuAUL);
@@ -190,6 +190,8 @@
             }
         };
         ajaxJsonFun();
+        //取出历史选中并选中
+        getBrowItem();
         $("#stateBtn").click(function () {
             $('#exampleModal').modal('hide');  //手动关闭
         });
@@ -200,6 +202,7 @@
 <input type="hidden" id="POWER_JSP" value="${POWER_JSP}">
 <input type="hidden" id="webSocketUrl" value="${WEBSOCKET_URLHEAD}">
 <input type="hidden" id="strSplit" value="${STR_SPLIT}">
+<input type="hidden" id="userId" value="${CURRENT_USER.userId}">
 <div class="wrapper">
 
     <header class="main-header">
@@ -341,21 +344,11 @@
 
 
     <div class="content-wrapper">
-        <section class="content">
-            <!-- 内容 src="${path}/paper/allPaper"-->
-            <div class="page-content-wrapper">
-                <div class="page-content">
-                    <div class="">
-                        <iframe style="width:100%; overflow-x:hidden;overflow-y:scroll" id="iFrame1" name="iFrame1" frameborder="0"></iframe>
-                    </div>
-                </div>
-            </div>
-
-        </section>
+        <iframe style="width:100%; overflow-x:hidden;overflow-y:scroll" id="iFrame1" name="iFrame1" frameborder="0"></iframe>
     </div>
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200211
+            <b>Version</b> 20200818
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
@@ -405,7 +398,7 @@
         var headerHeight = $(".main-header").height() || 0;
         var footerHeight = ($(".main-footer").height() || 0) + 31;
         var windowHeight = $(window).height();
-        $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 32);
+        $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight);
         $("#indexTreeMenu").css("max-height",windowHeight - headerHeight - 10);
     })
 </script>
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index fa07267..525895b 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -145,7 +145,7 @@
         }
 
         .verifyModal .modal-content {
-            margin-left:35%;
+            margin-left: 35%;
             margin-top: 10%;
             width: 100%;
         }
@@ -175,81 +175,90 @@
 <input type="hidden" id="isSearch" value="1">
 <!--当前操作角色-->
 <input type="hidden" id="checker" value="4">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案室终审
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="name">主管医生:</label>
-                <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25" placeholder="请输入主管医生姓名">
-            </div>
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName"
-                        title="请输入科室">
-                    <option value="">全部</option>
-                </select>
             </div>
+        </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="name">主管医生:</label>
+                        <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
+                               placeholder="请输入主管医生姓名">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
 
-            <div class="form-group divCss">
-                <label>出院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDateTo" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10" autocomplete="off"/>
+                    <div class="form-group divCss">
+                        <label>出院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                           
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class="btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
                 </div>
             </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
-        </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                   
-                    <option value="selected">导出选中数据</option>
-                </select>
-            </div>
-            <button class="btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-
 <!-- 模态框3（Modal）查看档案 -->
 <div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
@@ -378,7 +387,8 @@
                     <div class="form-group"><input id="fileUrlInp" hidden/>
                         <label class="col-sm-4 control-label">标题：</label>
                         <div class="col-sm-5">
-                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle" maxlength="100">
+                            <input type="text" class="input-sm form-control" id="inpTitle" name="inpTitle"
+                                   maxlength="100">
                         </div>
                         <div class="col-sm-1"></div>
                     </div>
@@ -649,7 +659,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-08-12"></script>
+<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-08-18"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
index 4944eaa..e5a8fff 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
@@ -50,330 +50,95 @@
     </style>
 </head>
 <body>
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案终审退回日志
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">身份证号:</label>
-                <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">
-            </div>
-            <div class="form-group divCss8">
-                <label for="creater">&emsp;召回人:</label>
-                <input type="text" class="input-sm form-control" id="creater" placeholder="请输入召回人">
             </div>
-            <div class="form-group divCss8">
-                <label for="archivestate">归档状态:</label>
-                <select class="input-sm form-control" id="archivestate">
-                    <option value="">全部</option>
-                    <option value="0">未归档</option>
-                    <option value="1">已归档</option>
-                </select>
-            </div>
-            <%--<div class="form-group divCss8">
-                <label for="state">状态 :</label>
-                <select class="input-sm form-control" id="state">
-                    <option value="">全部</option>
-                    <option value="已召回">已召回</option>
-                    <option value="未召回">未召回</option>
-                </select>
-            </div>--%>
-            <div class="form-group divCss">
-                <label>召回日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDate"  maxlength="10" autocomplete="off"/>
+        </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">身份证号:</label>
+                        <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="creater">&emsp;召回人:</label>
+                        <input type="text" class="input-sm form-control" id="creater" placeholder="请输入召回人">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="archivestate">归档状态:</label>
+                        <select class="input-sm form-control" id="archivestate">
+                            <option value="">全部</option>
+                            <option value="0">未归档</option>
+                            <option value="1">已归档</option>
+                        </select>
+                    </div>
+                    <%--<div class="form-group divCss8">
+                        <label for="state">状态 :</label>
+                        <select class="input-sm form-control" id="state">
+                            <option value="">全部</option>
+                            <option value="已召回">已召回</option>
+                            <option value="未召回">未召回</option>
+                        </select>
+                    </div>--%>
+                    <div class="form-group divCss">
+                        <label>召回日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10"
+                                   autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDate" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
                 </div>
+            </form>
+            <!--数据表格-->
+            <div class="table-responsive">
+                <table id="table" class="table text-nowrap"></table>
             </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-        </div>
-    </form>
-    <!--数据表格-->
-    <div class="table-responsive">
-        <table id="table" class="table text-nowrap"></table>
-    </div>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                    <option value="all">导出全部数据</option>
-                    <option value="selected">导出选中数据</option>
-                </select>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                            <option value="all">导出全部数据</option>
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
 </body>
 <script>
     var path = "${path}";
-    var tipLoad = 1;
-    $(function () {
-        initDateInput('startDate', 'endDate');
-        //日期控件
-        var url = window.location.href;
-        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-        if (index != null && index != "" && index.indexOf("excel") != -1) {
-            $("#excelBtn").show();
-            $("#toolbar").show();
-        } else {
-            $("#excelBtn").hide();
-            $(".columns-right").hide();
-        }
-    });
-
-    //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
-    function DoOnCellHtmlData(cell, row, col, data) {
-        if (row == 0) {
-            return data;
-        }
-        //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
-        if (col == 4 || col == 11 || col == 7) {
-            var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
-            var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
-            //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
-            if (typeof (title) != 'undefined') {
-                return title;
-            }
-        }
-        return data;
-    }
-
-    function initTable() {
-        if (tipLoad == 1) {
-            $("#table").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/recallDate/recallDateList", // 获取表格数据的url
-                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                striped: true,  //表格显示条纹，默认为false
-                pagination: true, // 在表格底部显示分页组件，默认false
-                pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-                showColumns: true,
-                paginationShowPageGo: true,
-                // sortable: true,
-                // sortOrder: "asc",
-                toolbar: '#toolbar',//指定工具栏
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '---', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                //height: getHeight(220),     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                //是否显示导出按钮
-                showExport: true,
-                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
-                exportDataType: "basic",
-                //导出文件类型
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
-                exportOptions: {
-                    fileName: document.title
-                },
-                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 temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        order: params.order,      //排位命令（desc，asc）
-                        idNo: $("#idNo").val(),
-                        inpNo: $("#inpNo").val(),
-                        visitId: $("#visitId").val(),
-                        name: $("#name").val(),
-                        archivestate: $("#archivestate").val(),
-                        startDate: $("#startDate").val(),
-                        endDate: $("#endDate").val(),
-                        callbackUserName: $("#creater").val()
-                    };
-                    return temp;
-                },
-                sortName: 'id', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'center',
-                    valign: 'middle',
-                },
-                    {
-                        title: '序号',
-                        field: 'id',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return index + 1;
-                        }
-                    },
-                    {
-                        title: '住院号',
-                        field: 'inpNo',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '住院次数',
-                        field: 'visitId',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '姓名',
-                        field: 'name',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '出院科室',
-                        field: 'deptName',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '召回人',
-                        field: 'callbackUserName',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '召回时间',
-                        field: 'callbackTime',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value) {
-                            return operDisTime(value);
-                        }
-                    },
-                    {
-                        title: '召回原因',
-                        field: 'callbackReason',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '状态',
-                        field: 'status',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function () {
-                            return '<span style="color:#3e8f3e"><i class="fa fa-check-circle-o" aria-hidden="true"></i>已召回</span>';
-                        }
-                    },
-                    {
-                        title: '归档状态',
-                        field: 'archivestate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value) {
-                            if (value == '已归档') {
-                                return '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>已归档</span>';
-                            } else {
-                                return '<p class="hidden-xs" title="' + value + '" style="color:red">' + value + '</p>'
-                            }
-                        }
-                    }
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    //console.info("加载成功");
-                    $(".page-list").show();
-                    tipLoad = 0;
-                    reloadTableHeight("table");
-                },
-                onLoadError: function () {  //加载失败时执行
-                    //console.info("加载数据失败");
-                    tipLoad = 0;
-                }
-            });
-        }
-    }
-
-    //查询
-    $('#searchBtn').click(function () {
-        //查询之后重新从第一页算起
-        if (tipLoad == 0) {
-            $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
-        } else {
-            toastr.warning("正在查询，请稍等...");
-        }
-    });
-
-    initTable();
-
-    //2.初始化select的change事件
-    $("#sel_exportoption").change(function () {
-        $('#table').bootstrapTable('refreshOptions', {
-            exportDataType: $(this).val()
-        });
-    });
-    $("#refreshBtn").click(function () {
-        //刷新
-        $('#table').bootstrapTable('refresh');
-    });
-
-    //导出excel功能
-    $("#excelBtn").click(function () {
-        var inpNo = $("#inpNo").val();
-        var visitId = $("#visitId").val();
-        var name = $("#name").val();
-        var idNo = $("#idNo").val();
-        var archivestate = $("#archivestate").val();
-        var startDate = $("#startDate").val();
-        var endDate = $("#endDate").val();
-        var callbackUserName = $("#creater").val()
-        var url = "${path}/recallDate/exportExcel";
-        post(url, {
-            "inpNo": inpNo,
-            "visitId": visitId,
-            "name": name,
-            "idNo": idNo,
-            "archivestate": archivestate,
-            "startDate": startDate,
-            "endDate": endDate,
-            "callbackUserName": callbackUserName
-        });
-    });
 </script>
+<script src="${path}/static/js/recallDateList/recallDateList.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
index 60005dd..5f897ec 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
@@ -57,78 +57,84 @@
     var path = "${path}";
 </script>
 <body>
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案终审退回
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">身份证号:</label>
-                <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号" maxlength="18">
-            </div>
-            <%--<div class="form-group divCss8">
-                <label for="archivestate">归档状态 :</label>
-                <select class="input-sm form-control" id="archivestate">
-                    <option value="">全部</option>
-                    <option value="已认证">已认证</option>
-                    <option value="已归档">已归档</option>
-                </select>
-            </div>--%>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>入院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName" title="请输入科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss">
-                <label for="state">召回状态:</label>
-                <select class="input-sm form-control" id="state">
-                    <option value="">全部</option>
-                    <option value="1">已召回</option>
-                    <option value="0">未召回</option>
-                </select>
             </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                   --%>
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">身份证号:</label>
+                        <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号" maxlength="18">
+                    </div>
+                    <%--<div class="form-group divCss8">
+                        <label for="archivestate">归档状态 :</label>
+                        <select class="input-sm form-control" id="archivestate">
+                            <option value="">全部</option>
+                            <option value="已认证">已认证</option>
+                            <option value="已归档">已归档</option>
+                        </select>
+                    </div>--%>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>入院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName" title="请输入科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss">
+                        <label for="state">召回状态:</label>
+                        <select class="input-sm form-control" id="state">
+                            <option value="">全部</option>
+                            <option value="1">已召回</option>
+                            <option value="0">未召回</option>
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                           --%>
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success btn-sm" style="height: 34px" type="button" id="refreshBtn"
+                            name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success btn-sm" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
@@ -152,7 +158,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">病案号：</label>
                             <div class="col-sm-5">
-                                <input type="text" class="input-sm form-control" readonly id="archiveDetailId" name="archiveDetailId">
+                                <input type="text" class="input-sm form-control" readonly id="archiveDetailId"
+                                       name="archiveDetailId">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -208,7 +215,8 @@
                     <input type="hidden" name="formToken" id="formToken">
                     <div class="form-group ">
                         <input type="hidden" id="id" name="id" value=""/><label hidden id="danganhao"></label>
-                        <span style="vertical-align:top;">原因：</span><textarea rows="6" cols="70" maxlength="255" id="recallReason2"></textarea>
+                        <span style="vertical-align:top;">原因：</span><textarea rows="6" cols="70" maxlength="255"
+                                                                              id="recallReason2"></textarea>
                     </div>
                 </form>
             </div>
@@ -220,5 +228,5 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-08-12"></script>
+<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp
index b043f85..ecb2f7b 100644
--- a/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/finalStatistics.jsp
@@ -44,57 +44,63 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             终审记录统计报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>终审日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endTime1"
-                            maxlength="10" style="text-align: center" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>终审时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>
-                                   
-                    <option value="all">导出全部数据</option>
-                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>终审日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="start" id="startTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endTime1"
+                                   maxlength="10" style="text-align: center" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>终审时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/finalStatistics.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/finalStatistics.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp
index add6530..dd6aa08 100644
--- a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp
@@ -18,17 +18,20 @@
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
+
         /**
         *多选下拉框
         */
-        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
-            width: 168px!important;
+        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+            width: 168px !important;
         }
-        .filter-option-inner-inner{
+
+        .filter-option-inner-inner {
             font-size: 12px;
         }
     </style>
@@ -40,84 +43,95 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             终审记录明细报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>审核日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss8">
-                <label>审核姓名:</label>
-                <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label >出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control"  id="startTime2" style="text-align: center" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control"  id="endTime2" style="text-align: center" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>患者姓名:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label>&emsp;住院号:</label>
-                <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-                <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
             </div>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-bordered"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>审核日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>审核姓名:</label>
+                        <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime2" style="text-align: center"
+                                   autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime2" style="text-align: center"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>患者姓名:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>&emsp;住院号:</label>
+                        <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                        <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    </div>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-bordered"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/finalStatisticsDetail.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/finalStatisticsDetail.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp
index ba80ab9..992a2c3 100644
--- a/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/firstStatistics.jsp
@@ -14,10 +14,12 @@
         .divCss {
             margin-top: 5px;
         }
+
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -31,54 +33,63 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案室审核记录统计表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>审核日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"  maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>审核时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
             </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>审核日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>审核时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/firstStatistics.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/firstStatistics.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp
index 1e34915..f016eb4 100644
--- a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp
@@ -14,10 +14,12 @@
         .divCss {
             margin-top: 5px;
         }
+
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -31,58 +33,67 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             复印记录报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>起止日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startTime1" maxlength="10" style="text-align: center" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endTime1"  maxlength="10" style="text-align: center" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>复印时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>操作人:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>起止日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="start" id="startTime1" maxlength="10"
+                                   style="text-align: center" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endTime1" maxlength="10"
+                                   style="text-align: center" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>复印时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>操作人:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/printCount.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/printCount.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp
index ddefe0f..2dc07ca 100644
--- a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp
@@ -14,10 +14,12 @@
         .divCss {
             margin-top: 5px;
         }
+
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -31,58 +33,67 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             复印记录明细
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>复印起止日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>复印时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>操作人:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>复印起止日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="start" id="startTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>复印时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>操作人:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/printInfo.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/printInfo.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp
index d6e6564..32a311e 100644
--- a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp
@@ -19,6 +19,7 @@
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         /*.table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -26,10 +27,11 @@
         /**
         *多选下拉框
         */
-        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
-            width: 168px!important;
+        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+            width: 168px !important;
         }
-        #tableDiv{
+
+        #tableDiv {
             margin-top: 10px;
         }
     </style>
@@ -48,83 +50,93 @@
 <!--第三层初始化按科室查-->
 <input type="hidden" id="searchDeptNameTemp">
 <input type="hidden" id="timeIntervalTemp" value="${record.timeInterval}">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案统计报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;height: 75px">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off" value="${record.startDate}"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off" value="${record.endDate}"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <c:choose>
-                    <c:when test="${level == '1'}">
-                        <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                        </select>
-                    </c:when>
-                    <c:when test="${level == '2'}">
-                        <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table1')">
+        </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;height: 75px">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off" value="${record.startDate}"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off" value="${record.endDate}"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <c:choose>
+                            <c:when test="${level == '1'}">
+                                <select class="form-control input-sm" id="timeInterval"
+                                        onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                                </select>
+                            </c:when>
+                            <c:when test="${level == '2'}">
+                                <select class="form-control input-sm" id="timeInterval"
+                                        onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table1')">
+                                </select>
+                            </c:when>
+                            <c:when test="${level == '3'}">
+                                <select class="form-control input-sm" id="timeInterval"
+                                        onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table2')">
+                                </select>
+                            </c:when>
+                        </c:choose>
                         </select>
-                    </c:when>
-                    <c:when test="${level == '3'}">
-                        <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table2')">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
                         </select>
-                    </c:when>
-                </c:choose>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label >出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>患者姓名:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8" value="${record.name}">
-            </div>
-            <div class="form-group divCss8">
-                <label>&emsp;住院号:</label>
-                <input type="text" class="form-control input-sm" id="inpNo" maxlength="25" value="${record.inpNo}">
-            </div>
-            <div class="form-group divCss8">
-                <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtnStatistics">查询</button>
-                <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-            </div>
-        </div>
-    </form>
-    <!--数据表格-->
-    <c:if test="${level == '1'}">
-        <div id="tableDiv">
-            <table id="table" class="table text-nowrap table-bordered"></table>
-        </div>
-    </c:if>
-    <c:if test="${level == '2'}">
-        <div id="tableDiv">
-            <table id="table1" class="table text-nowrap table-bordered"></table>
-        </div>
-    </c:if>
-    <c:if test="${level == '3'}">
-        <div id="tableDiv">
-            <table id="table2" class="table text-nowrap table-bordered"></table>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>患者姓名:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8" value="${record.name}">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>&emsp;住院号:</label>
+                        <input type="text" class="form-control input-sm" id="inpNo" maxlength="25"
+                               value="${record.inpNo}">
+                    </div>
+                    <div class="form-group divCss8">
+                        <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtnStatistics">查询</button>
+                        <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    </div>
+                </div>
+            </form>
+            <!--数据表格-->
+            <c:if test="${level == '1'}">
+                <div id="tableDiv">
+                    <table id="table" class="table text-nowrap table-bordered"></table>
+                </div>
+            </c:if>
+            <c:if test="${level == '2'}">
+                <div id="tableDiv">
+                    <table id="table1" class="table text-nowrap table-bordered"></table>
+                </div>
+            </c:if>
+            <c:if test="${level == '3'}">
+                <div id="tableDiv">
+                    <table id="table2" class="table text-nowrap table-bordered"></table>
+                </div>
+            </c:if>
         </div>
-    </c:if>
+    </div>
 </div>
-<script src="${path}/static/js/statistics/getDeptCommom.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/getDeptCommom.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 <script src="${path}/static/js/statistics/recordStatistics.js"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
index ba2a1ff..4b7b1ea 100644
--- a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
@@ -14,10 +14,12 @@
         .divCss {
             margin-top: 5px;
         }
+
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -31,58 +33,67 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             扫描上传记录报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>起止日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startTime1" maxlength="10" style="text-align: center" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>扫描时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>扫描人:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>起止日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="start" id="startTime1" maxlength="10"
+                                   style="text-align: center" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>扫描时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>扫描人:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/scanCount.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/scanCount.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
index 64044b7..8b61af8 100644
--- a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
@@ -14,10 +14,12 @@
         .divCss {
             margin-top: 5px;
         }
+
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
@@ -31,58 +33,67 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             扫描上传明细
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss">
-                <label>扫描起止日期:</label>
-                <div class="input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
             </div>
-            <div class="form-group divCss">
-                <label>扫描时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>扫描人:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss">
+                        <label>扫描起止日期:</label>
+                        <div class="input-group" id="datepicker">
+                            <input type="text" class="input-sm form-control" name="start" id="startTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endTime1"
+                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>扫描时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>扫描人:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/scanInfo.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp
index bdfde47..a1b2467 100644
--- a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp
@@ -11,26 +11,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <style>
-       /* .divCss {
-            margin-top: 5px;
-        }*/
+        /* .divCss {
+             margin-top: 5px;
+         }*/
         .divCss8 {
             margin-top: 5px;
             margin-right: 20px;
         }
+
         /* dataTables表头居中 */
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
-       /**
-      *多选下拉框
-      */
-       .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
-           width: 168px!important;
-       }
-       .filter-option-inner-inner{
-           font-size: 12px;
-       }
+
+        /**
+       *多选下拉框
+       */
+        .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+            width: 168px !important;
+        }
+
+        .filter-option-inner-inner {
+            font-size: 12px;
+        }
     </style>
     <script>
         var path = "${path}";
@@ -40,84 +43,95 @@
 <body>
 <!--隐藏是否是初始化-->
 <input type="hidden" id="isSearch" value="1">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             病案室审核记录明细报表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>审核日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss8">
-                <label>审核姓名:</label>
-               <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label >出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group">
-                    <input type="text" class="input-sm form-control"  id="startTime2" style="text-align: center" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control"  id="endTime2" style="text-align: center" maxlength="10" autocomplete="off"/>
-                </div>
-            </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>患者姓名:</label>
-                <input type="text" class="form-control input-sm" id="name" maxlength="8">
-            </div>
-            <div class="form-group divCss8">
-                <label>&emsp;住院号:</label>
-                <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-                <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
             </div>
         </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table text-nowrap table-bordered"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">                
-                    <option value="">导出当前页面数据</option>                                   
-                    <option value="all">导出全部数据</option>                                 
-                    <option value="selected">导出选中数据</option>
-                </select>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>审核日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>审核姓名:</label>
+                        <input type="text" class="form-control input-sm" id="checkDoctor" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime2" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime2" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime2','endTime2','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>患者姓名:</label>
+                        <input type="text" class="form-control input-sm" id="name" maxlength="8">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>&emsp;住院号:</label>
+                        <input type="text" class="form-control input-sm" id="inpNo" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                        <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                    </div>
+                </div>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table text-nowrap table-bordered"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">                
+                            <option value="">导出当前页面数据</option>
+                                           
+                            <option value="all">导出全部数据</option>
+                                         
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
+                </div>
             </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/statisticsDetail.js?time=2020-08-12"></script>
+<script src="${path}/static/js/statistics/statisticsDetail.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index a9ca641..f429573 100644
--- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -164,103 +164,116 @@
 <input type="hidden" id="isSearch" value="1">
 <!--当前操作角色-->
 <input type="hidden" id="checker">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             未终审病历列表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label for="name">主管医生:</label>
-                <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25" placeholder="请输入主管医生姓名">
-            </div>
-            <div hidden="hidden">
-                <label for="id">病案号:</label>
-                <input type="text" class="input-sm form-control" id="id" placeholder="请输入病案号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="inpNo">&emsp;住院号:</label>
-                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
-            </div>
-            <div class="form-group divCss8">
-                <label for="visitId">住院次数:</label>
-                <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数" maxlength="2">
-            </div>
-            <div class="form-group divCss8">
-                <label for="name">姓&emsp;&emsp;名:</label>
-                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
-            </div>
-            <div hidden="hidden">
-                <label for="name">身份证号:</label>
-                <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号" maxlength="20">
             </div>
-            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
-                <label>入院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptAdmissionTo" id="deptAdmissionTo" title="请输入入院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>入院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDate"  maxlength="10" autocomplete="off"/>
+        </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label for="name">主管医生:</label>
+                        <input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
+                               placeholder="请输入主管医生姓名">
+                    </div>
+                    <div hidden="hidden">
+                        <label for="id">病案号:</label>
+                        <input type="text" class="input-sm form-control" id="id" placeholder="请输入病案号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="inpNo">&emsp;住院号:</label>
+                        <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号" maxlength="25">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="visitId">住院次数:</label>
+                        <input type="number" class="input-sm form-control" min="1" id="visitId" placeholder="请输入次数"
+                               maxlength="2">
+                    </div>
+                    <div class="form-group divCss8">
+                        <label for="name">姓&emsp;&emsp;名:</label>
+                        <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名" maxlength="8">
+                    </div>
+                    <div hidden="hidden">
+                        <label for="name">身份证号:</label>
+                        <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号" maxlength="20">
+                    </div>
+                    <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                        <label>入院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptAdmissionTo"
+                                id="deptAdmissionTo" title="请输入入院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>入院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10"
+                                   autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDate" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8" style="height: 18px;margin-top: -7px;">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>出院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDateTo"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院时段:</label>
+                        <select class="form-control input-sm" id="timeInterval"
+                                onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
+                        </select>
+                    </div>
+                    <div class="form-group divCss">
+                        <label>归档状态:</label>
+                        <select class="input-sm form-control" id="archivestate">
+                            <option value="">全部</option>
+                            <option value="0">在院</option>
+                            <option value="1">归档中</option>
+                        </select>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
                 </div>
-            </div>
-            <div class="form-group divCss8" style="height: 18px;margin-top: -7px;">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>出院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDateTo" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDateTo" maxlength="10" autocomplete="off"/>
+            </form>
+            <!--数据表格-->
+            <table id="table" class="table  text-nowrap table-striped"></table>
+            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                <div class="columns columns-right btn-group pull-right">
+                    <div class="btn-group btn-info">
+                        <select id="sel_exportoption" class="form-control">
+                            <option value="">导出当前页面数据</option>
+                            <option value="all">导出全部数据</option>
+                            <option value="selected">导出选中数据</option>
+                        </select>
+                    </div>
+                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
+                            aria-label="Refresh"
+                            title="Refresh">
+                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                    </button>
                 </div>
             </div>
-            <div class="form-group divCss">
-                <label>出院时段:</label>
-                <select class="form-control input-sm" id="timeInterval" onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
-                </select>
-            </div>
-            <div class="form-group divCss">
-                <label>归档状态:</label>
-                <select class="input-sm form-control" id="archivestate">
-                    <option value="">全部</option>
-                    <option value="0">在院</option>
-                    <option value="1">归档中</option>
-                </select>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-        </div>
-    </form>
-    <!--数据表格-->
-    <table id="table" class="table  text-nowrap table-striped"></table>
-    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-        <div class="columns columns-right btn-group pull-right">
-            <div class="btn-group btn-info">
-                <select id="sel_exportoption" class="form-control">
-                    <option value="">导出当前页面数据</option>
-                    <option value="all">导出全部数据</option>
-                    <option value="selected">导出选中数据</option>
-                </select>
-            </div>
-            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh"
-                    aria-label="Refresh"
-                    title="Refresh">
-                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-            </button>
         </div>
     </div>
 </div>
@@ -397,7 +410,8 @@
                                 <div style="float:left;" id="faultTypeDiv"></div>
                             </div>
                             <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6" cols="80"></textarea>
+                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6"
+                                                                                      cols="80"></textarea>
                             </div>
                         </div>
                     </div>
@@ -406,10 +420,12 @@
                         <div class="row divCss3 ">退回信息</div>
                         <div class="row divCss2">
                             <div class="row divCss2">
-                                <span style="vertical-align:center;">评分：</span><input id="score" type="number" class="input-sm "/> 分
+                                <span style="vertical-align:center;">评分：</span><input id="score" type="number"
+                                                                                      class="input-sm "/> 分
                             </div>
                             <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6" cols="80"></textarea>
+                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6"
+                                                                                      cols="80"></textarea>
                             </div>
                         </div>
                     </div>
@@ -615,361 +631,8 @@
 </body>
 <script type="text/javascript">
     var path = "${path}";
-    var tipLoad = 1;
-    $(function () {
-        getChecker();
-        var url = window.location.href;
-        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-        if (index != null && index != "" && index.indexOf("excel") != -1) {
-            $("#excelBtn").show();
-            $("#toolbar").show();
-        } else {
-            $("#excelBtn").hide();
-            $(".columns-right").hide();
-        }
-        if (index != null && index != "" && index.indexOf("upload") != -1) {
-            $("#uploadBtn").show();
-        } else {
-            $("#uploadBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("pdf") != -1) {
-            $("#pdfBtn").show();
-        } else {
-            $("#pdfBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("pdf2") != -1) {
-            $("#pdfBtn2").show();
-        } else {
-            $("#pdfBtn2").hide();
-        }
-        if (index != null && index != "" && index.indexOf("cancelAll") != -1) {
-            $("#updateStateBtn").show();
-        } else {
-            $("#updateStateBtn").hide();
-        }
-        if (index != null && index != "" && index.indexOf("useAll") != -1) {
-            $("#updateStateBtn2").show();
-        } else {
-            $("#updateStateBtn2").hide();
-        }
-    });
-
-    function initTable() {
-        if (tipLoad == 1) {
-            $("#table").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/unfile/unfileList", // 获取表格数据的url
-                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-                //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
-                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                striped: true,  //是否显示行间隔色
-                pagination: true, // 在表格底部显示分页组件，默认false
-                paginationShowPageGo: true,
-                pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-                showColumns: true,
-                toolbar: '#toolbar',//指定工具栏
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '---', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                //height: getHeight(260),     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                //是否显示导出按钮
-                showExport: true,
-                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
-                exportDataType: "basic",
-                //导出文件类型
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
-                exportOptions: {
-                    fileName: document.title
-                },
-                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 deptName = $("#deptName").val();
-                    if (deptName.indexOf("") != -1) {
-                        deptName = "";
-                    } else {
-                        deptName = $("#deptName").val().toString();
-                    }
-
-                    var deptAdmissionTo = $("#deptAdmissionTo").val();
-                    if (deptAdmissionTo.indexOf("") != -1) {
-                        deptAdmissionTo = "";
-                    } else {
-                        deptAdmissionTo = $("#deptAdmissionTo").val().toString();
-                    }
-
-                    var temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        inpNo: "" + $("#inpNo").val(),
-                        visitId: "" + $("#visitId").val(),
-                        name: "" + $("#name").val(),
-                        deptName: deptName.toString(),
-                        deptAdmissionTo: deptAdmissionTo.toString(),
-                        archivestate: "" + $("#archivestate").val(),
-                        startDateTo: $("#startDateTo").val(),
-                        endDateTo: $("#endDateTo").val(),
-                        startDate: $("#startDate").val(),
-                        endDate: $("#endDate").val(),
-                        doctorInCharge: $("#doctorInCharge").val(),
-                        isSearch: $("#isSearch").val()
-                    };
-                    return temp;
-                },
-                sortName: 'id', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'center',
-                    valign: 'middle',
-                },
-                    {
-                        title: '住院号',
-                        field: 'inpNo',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '住院次数',
-                        field: 'visitId',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '姓名',
-                        field: 'name',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '性别',
-                        field: 'sex',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '入院科室',
-                        field: 'deptAdmissionTo',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '入院日期',
-                        field: 'admissionDateTime',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            return operDisDate(value);
-                        }
-                    },
-                    {
-                        title: '出院科室',
-                        field: 'deptName',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '出院日期',
-                        field: 'dischargeDateTime',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return operDisDate(value);
-                        }
-                    },
-                    {
-                        title: '主管医生',
-                        field: 'doctorInCharge',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '状态',
-                        field: 'status',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: paramsMatter,
-                    },
-                    {
-                        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("select") != -1) {
-                                html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';
-                            }
-                            if (index != null && index != "" && index.indexOf("showFlow") != -1) {
-                                html += '<button type="button" class="btn btn-sm btn-success showFlowInfo">查看流程</button>'
-                            }
-                            return html;
-                        }, events: {
-                            'click .selInfo': function (e, value, row, index) {
-                                //查询是否医生或护士是否提交
-                                //selectHis(row);
-                                $('#selModal').modal({
-                                    backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                    keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                    show: true//弹出对话框
-                                });
-                                if (row.archivestate != '复审退回') {
-                                    $("#recallDiv").hide();
-                                } else {
-                                    $("#recallDiv").show();
-                                }
-                                if (row.archivestate == '初审') {
-                                    $("#firstDiv").show();
-                                } else {
-                                    $("#firstDiv").hide();
-                                }
-                                //删除缓存
-                                //删除病历清单分段树选中
-                                $("#assortId").html(0);
-                                //删除病历清单查看单个pdf复选框选中信息
-                                idArr = [];
-                                //同步
-                                $("#idLab").html(row.id);
-                                $("#nameLab").html(row.name);
-                                $("#inDateLab").html(operDisTime(row.admissionDateTime));
-                                $("#chargeLab").html(row.doctorInCharge);
-                                $("#deptToLab").html(row.deptAdmissionTo);
-                                //出院
-                                if (row.dischargeDateTime != null && row.dischargeDateTime != '') {
-                                    $("#inDateLab1").html(operDisTime(row.dischargeDateTime));
-                                }
-                                $("#deptToLab1").html(row.deptName);
-
-                                $("#outHospLab").html(row.dischargeDisposition);
-                                $("#inLab").html(row.inpNo);
-                                $("#inTimeLab").html(row.visitId);
-                                $("#wzContent").html(row.lockinfo);
-                                //入/出院年+出院月+住院号+住院次数
-                                var outDate = "";
-                                if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
-                                    outDate = row.dischargeDateTime.split("-");
-                                } else if (row.admissionDateTime != null && row.admissionDateTime == "") {
-                                    outDate = row.admissionDateTime.split("-");
-                                }
-                                $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
-
-                                initTree(row.id, $("#checker").val());
-                            },
-                            //查看流程
-                            'click .showFlowInfo': function (e, value, row) {
-                                $('#showFlowInfo').modal({
-                                    backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                                    keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                                    show: true//弹出对话框
-                                });
-                                var masterId = row.id;
-                                var name = row.name;
-                                var inpNo = row.inpNo;
-                                var visitId = row.visitId;
-                                var dischargeDateTime = row.dischargeDateTime;
-                                $("#showFlowInfoIframe").prop("src", path + "/beHosp/toShowFlowInfo?id=" + masterId + "&name=" + name + "&inpNo=" + inpNo + "&visitId=" + visitId + "&dischargeDateTime=" + dischargeDateTime + "&role=" + $("#checker").val());
-                            }
-                        },
-                        cellStyle: function (value, row, index) {
-                            return {classes: 'success'}
-
-                        }
-                    }
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    // console.info("加载成功");
-                    $(".page-list").show();
-                    tipLoad = 0;
-                    reloadTableHeight("table");
-                },
-                onLoadError: function () {  //加载失败时执行
-                    //console.info("加载数据失败");
-                    tipLoad = 0;
-                }
-            });
-        }
-    }
-
-    function paramsMatter(value, row) {
-        var result = '';
-        if (value == '在院') {
-            return '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>在院</span>';
-        } else {
-            if (row.days > 0) {
-                result = '<span style="color:red">(超期)</span></span>';
-            }
-            value = '<p class="hidden-xs" title="' + value + '">' + result + value + '</p>';
-        }
-        return value;
-    }
-
-    //导出excel功能
-    $("#excelBtn").click(function () {
-        var doctorInCharge = $("#doctorInCharge").val();
-        var inpNo = $("#inpNo").val();
-        var visitId = $("#visitId").val();
-        var name = $("#name").val();
-        var deptName = $("#deptName").val();
-        if (deptName.indexOf("") != -1) {
-            deptName = "";
-        } else {
-            deptName = $("#deptName").val().toString();
-        }
-        var deptAdmissionTo = $("#deptAdmissionTo").val();
-        if (deptAdmissionTo.indexOf("") != -1) {
-            deptAdmissionTo = "";
-        } else {
-            deptAdmissionTo = $("#deptAdmissionTo").val().toString();
-        }
-        var archivestate = $("#archivestate").val();
-        var startDateTo = $("#startDateTo").val();
-        var endDateTo = $("#endDateTo").val();
-        var startDate = $("#startDate").val();
-        var endDate = $("#endDate").val();
-        var isSearch = $("#isSearch").val();
-        var url = "${path}/unfile/exportExcel";
-        post(url, {
-            "doctorInCharge": doctorInCharge,
-            "inpNo": inpNo,
-            "visitId": visitId,
-            "name": name,
-            "deptAdmissionTo": deptAdmissionTo,
-            "startDate": startDate,
-            "endDate": endDate,
-            "deptName": deptName,
-            "startDateTo": startDateTo,
-            "endDateTo": endDateTo,
-            "isSearch": isSearch,
-            "archivestate": archivestate
-        })
-    });
 </script>
+<script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-08-18"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp
index b330266..f6290cc 100644
--- a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp
+++ b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp
@@ -29,6 +29,7 @@
         .table > thead:first-child > tr:first-child > th {
             text-align: center !important;
         }
+
         /**
       *多选下拉框
         */
@@ -48,46 +49,51 @@
 <body>
 <!--赋值权限按钮标识-->
 <input type="hidden" id="power">
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             医师归档统计
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <!--搜索-->
-    <form style="margin-top:5px;margin-bottom: 0!important;">
-        <div class="form-inline">
-            <div class="form-group divCss8">
-                <label>出院科室:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
-                        id="deptName"
-                        title="请输入出院科室">
-                    <option value="">全部</option>
-                </select>
-            </div>
-            <div class="form-group divCss8">
-                <label>主管医生:</label>
-                <input type="text" class="form-control input-sm" id="doctor" style="width: 116px;">
             </div>
-            <div class="form-group divCss">
-                <label>出院日期:</label>
-                <div class="input-group input-daterange">
-                    <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10" autocomplete="off"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDate"  maxlength="10" autocomplete="off"/>
+        </div>
+        <div class="mainDiv">
+            <!--搜索-->
+            <form style="margin-top:5px;margin-bottom: 0!important;">
+                <div class="form-inline">
+                    <div class="form-group divCss8">
+                        <label>出院科室:</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
+                                id="deptName"
+                                title="请输入出院科室">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="form-group divCss8">
+                        <label>主管医生:</label>
+                        <input type="text" class="form-control input-sm" id="doctor" style="width: 116px;">
+                    </div>
+                    <div class="form-group divCss">
+                        <label>出院日期:</label>
+                        <div class="input-group input-daterange">
+                            <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10"
+                                   autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" name="end" id="endDate" maxlength="10"
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <button type="button" class="btn btn-primary btn-sm divCss" onclick="searchBtn()">查询</button>
                 </div>
-            </div>
-            <button type="button" class="btn btn-primary btn-sm divCss" onclick="searchBtn()">查询</button>
+            </form>
+            <!--数据表格-->
+            <iframe src="${path}/vCount/getDoctorFileInfoIframe"
+                    style="height:calc(100vh - 94px);width:100%; overflow-x:hidden;overflow-y:scroll" id="iframe"
+                    frameborder="0"></iframe>
         </div>
-    </form>
-    <!--数据表格-->
-    <iframe src="${path}/vCount/getDoctorFileInfoIframe"
-            style="height:calc(100vh - 44px);width:100%; overflow-x:hidden;overflow-y:scroll" id="iframe"
-            frameborder="0"></iframe>
+    </div>
 </div>
-
 </body>
-<script src="${path}/static/js/vCount/doctorFileList.js"></script>
+<script src="${path}/static/js/vCount/doctorFileList.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileListIframe.jsp b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileListIframe.jsp
index 1bcef7b..4f2f6b8 100644
--- a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileListIframe.jsp
+++ b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileListIframe.jsp
@@ -120,5 +120,5 @@
     </table>
 </div>
 </body>
-<script src="${path}/static/js/vCount/doctorFileListIframe.js?t=2020-01-09"></script>
+<script src="${path}/static/js/vCount/doctorFileListIframe.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp
index 866ee17..2387e97 100644
--- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp
+++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp
@@ -41,923 +41,95 @@
         .filter-option-inner-inner {
             font-size: 12px;
         }
+
         /**
         * echartDiv样式
          */
-        .echartsClass{
+        .echartsClass {
             margin-top: 10px;
-            background-color:#ECF0F5;
-            width:calc(100vw - 60px);
-            height:calc(100vh - 57px);
+            background-color: #ECF0F5;
+            width: calc(100vw - 50px);
+            height: calc(100vh - 107px);
         }
     </style>
 </head>
 <body>
-<div class="headDiv">
-    <div class="headSpanDiv">
+<div class="mainBody">
+    <div class="main">
+        <div class="headDiv">
+            <div class="headSpanDiv">
         <span class="headspan">
             统计列表
         </span>
-    </div>
-</div>
-<div class="mainDiv">
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">统计表格</a></li>
-        <li role="presentation"><a href="#home1" aria-controls="home1" role="tab" data-toggle="tab">归档率统计图表</a></li>
-        <li role="presentation"><a href="#home2" aria-controls="home2" role="tab" data-toggle="tab">出院统计图表</a></li>
-    </ul>
-    <div class="tab-content">
-        <div role="tabpanel" class="tab-pane fade in active" id="home">
-            <!--搜索-->
-            <form style="margin-top:5px;margin-bottom: 0!important;">
-                <div class="form-inline">
-                    <div class="form-group divCss8" style="height: 18px;margin-top: -7px;">
-                        <label>出院科室:</label>
-                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName" title="请输入出院科室">
-                            <option value="">全部</option>
-                        </select>
-                    </div>
-                    <div class="form-group divCss">
-                        <label>出院日期:</label>
-                        <div class="input-group input-daterange">
-                            <input type="text" class="input-sm form-control" name="start" id="startDate" maxlength="10" autocomplete="off"/>
-                            <span class="input-group-addon">-</span>
-                            <input type="text" class="input-sm form-control" name="end" id="endDate" maxlength="10" autocomplete="off"/>
+            </div>
+        </div>
+        <div class="mainDiv">
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab"
+                                                          data-toggle="tab">统计表格</a></li>
+                <li role="presentation"><a href="#home1" aria-controls="home1" role="tab" data-toggle="tab">归档率统计图表</a>
+                </li>
+                <li role="presentation"><a href="#home2" aria-controls="home2" role="tab" data-toggle="tab">出院统计图表</a>
+                </li>
+            </ul>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane fade in active" id="home">
+                    <!--搜索-->
+                    <form style="margin-top:5px;margin-bottom: 0!important;">
+                        <div class="form-inline">
+                            <div class="form-group divCss8" style="height: 18px;margin-top: -7px;">
+                                <label>出院科室:</label>
+                                <select class="selectpicker bla bla bli" multiple data-live-search="true"
+                                        name="deptName" id="deptName" title="请输入出院科室">
+                                    <option value="">全部</option>
+                                </select>
+                            </div>
+                            <div class="form-group divCss">
+                                <label>出院日期:</label>
+                                <div class="input-group input-daterange">
+                                    <input type="text" class="input-sm form-control" name="start" id="startDate"
+                                           maxlength="10" autocomplete="off"/>
+                                    <span class="input-group-addon">-</span>
+                                    <input type="text" class="input-sm form-control" name="end" id="endDate"
+                                           maxlength="10" autocomplete="off"/>
+                                </div>
+                            </div>
+                            <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+                            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
+                            <button type="button" class="btn btn-danger btn-sm divCss" id="excelBtn2">未归档导出</button>
+                        </div>
+                    </form>
+                    <!--数据表格-->
+                    <table id="table" class="table table-striped"></table>
+                    <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
+                        <div class="columns columns-right btn-group pull-right">
+                            <div class="btn-group btn-info">
+                                <select id="sel_exportoption" class="form-control">
+                                    <option value="">导出当前页面数据</option>
+                                    <option value="all">导出全部数据</option>
+                                    <option value="selected">导出选中数据</option>
+                                </select>
+                            </div>
+                            <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn"
+                                    name="refresh" aria-label="Refresh" title="Refresh">
+                                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+                            </button>
                         </div>
                     </div>
-                    <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-                    <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
-                    <button type="button" class="btn btn-danger btn-sm divCss" id="excelBtn2">未归档导出</button>
                 </div>
-            </form>
-            <!--数据表格-->
-            <table id="table" class="table table-striped"></table>
-            <div id="toolbar" class="btn-group pull-right" style="margin-right: 20px;">
-                <div class="columns columns-right btn-group pull-right">
-                    <div class="btn-group btn-info">
-                        <select id="sel_exportoption" class="form-control">
-                            <option value="">导出当前页面数据</option>
-                            <option value="all">导出全部数据</option>
-                            <option value="selected">导出选中数据</option>
-                        </select>
-                    </div>
-                    <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh" title="Refresh">
-                        <i class="glyphicon glyphicon-refresh icon-refresh"></i>
-                    </button>
+                <div role="tabpanel" class="tab-pane fade" id="home1">
+                    <div class="echartsClass" id="chartmainTwo"></div>
+                </div>
+                <div role="tabpanel" class="tab-pane fade" id="home2">
+                    <div class="echartsClass" id="chartmainOne"></div>
                 </div>
             </div>
         </div>
-        <div role="tabpanel" class="tab-pane fade" id="home1">
-            <div  class="echartsClass" id="chartmainTwo"></div>
-        </div>
-        <div role="tabpanel" class="tab-pane fade" id="home2">
-            <div class="echartsClass" id="chartmainOne"></div>
-        </div>
     </div>
 </div>
 </body>
 <script>
     var path = "${path}";
-    var tipLoad = 1;
-    $(function () {
-        getDept();
-        //日期控件
-        initDateInput('startDate', 'endDate');
-        var url = window.location.href;
-        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-        if (index != null && index != "" && index.indexOf("excel") != -1) {
-            $("#excelBtn").show();
-            $("#toolbar").show();
-        } else {
-            $("#excelBtn").hide();
-            $(".columns-right").hide();
-        }
-        if (index != null && index != "" && index.indexOf("excel2") != -1) {
-            $("#excelBtn2").show();
-        } else {
-            $("#excelBtn2").hide();
-        }
-        var myChartOne = echarts.init(document.getElementById('chartmainOne'));
-        var myChartTwo = echarts.init(document.getElementById('chartmainTwo'));
-        // var myChartThree = echarts.init(document.getElementById('chartmainThree'));
-        // var myChartFour = echarts.init(document.getElementById('chartmainFour'));
-        var deptArr = ['科室1', '科室3', '科室4', '科室5', '科室6', '科室7', '科室8', '科室9'];
-        var outArr = [400, 400, 300, 300, 300, 400, 400, 400, 300];
-        var fileArr = [400, 500, 500, 500, 500, 400, 400, 500, 500];
-        var unFileArr = [400, 600, 700, 700, 1000, 400, 400, 600, 700];
-        var deathArr = [400, 500, 500, 500, 500, 400, 400, 500, 500];
-        var arr = [80, 34, 39, 35, 38, 36, 34, 36, 34];
-        var day2Arr = [25, 22, 26, 28, 27, 26, 23, 36, 34];
-        var day3Arr = [15, 12, 16, 18, 17, 16, 13, 36, 34];
-        var day7Arr = [10, 10, 10, 18, 17, 10, 63, 36, 34];
-        //获取部门统计列表
-        var entity = {};
-        entity.deptCode = $("#deptName").val();
-        entity.startDate = $("#startDate").val();
-        entity.endDate = $("#endDate").val();
-        $.ajax({
-            url: "${path}/vCount/vCountNumList",
-            type: "POST",
-            data: entity,
-            success: function (result) {
-                var optionOne;
-                var optionTwo;
-                if (result != null) {
-                    deptArr = [];
-                    outArr = [];
-                    fileArr = [];
-                    unFileArr = [];
-                    deathArr = [];
-                    arr = [];
-                    day2Arr = [];
-                    day3Arr = [];
-                    day7Arr = [];
-                    for (var i = 0; i < result.length; i++) {
-                        if (result[i].deptName != null && result[i].deptName != '') {
-                            //科室
-                            deptArr.push(result[i].deptName);
-                            //出院数
-                            outArr.push(result[i].outNum);
-                            //归档数
-                            fileArr.push(result[i].fileNum);
-                            //未归档数
-                            unFileArr.push(result[i].unfileNum);
-                            //死亡数
-                            deathArr.push(result[i].deathNum);
-                            //归档率
-                            arr.push(Math.round(result[i].fileRate * 100));
-                            //2日归档率
-                            day2Arr.push(Math.round(result[i].day2Rate * 100));
-                            //3日归档率
-                            day3Arr.push(Math.round(result[i].day3Rate * 100));
-                            //7日归档率
-                            day7Arr.push(Math.round(result[i].day7Rate * 100));
-                        }
-                    }
-                    optionOne = {
-                        backgroundColor: '#ECF0F5',
-                        tooltip: {
-                            trigger: 'axis',
-                            axisPointer: { // 坐标轴指示器，坐标轴触发有效
-                                type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-                            }
-                        },
-                        toolbox: {
-                            //show: true,
-                            feature: {
-                                //mark: {show: true},
-                                //dataView : {show: true, readOnly: false},
-                                magicType: {show: true, type: ['line', 'bar']},
-                                restore: {show: true},
-                                saveAsImage: {show: true}
-                            }
-                        },
-                        grid: {
-                            left: '2%',
-                            right: '4%',
-                            bottom: '14%',
-                            top: '16%',
-                            containLabel: true
-                        },
-                        legend: {
-                            data: ['出院人数', '已归档', '未归档', '死亡人数'],
-                            //right: 10,
-                            top: 12,
-                            textStyle: {
-                                color: "#323a5e"
-                            },
-                            itemWidth: 12,
-                            itemHeight: 10,
-                            // itemGap: 35
-                        },
-                        xAxis: {
-                            type: 'category',
-                            data: deptArr,
-                            axisLine: {
-                                lineStyle: {
-                                    color: '323a5e'
-
-                                }
-                            },
-                            axisLabel: {
-                                // interval: 0,
-                                // rotate: 40,
-                                textStyle: {
-                                    fontFamily: 'Microsoft YaHei'
-                                }
-                            },
-                        },
-
-                        yAxis: {
-                            type: 'value',
-                            axisLine: {
-                                show: false,
-                                lineStyle: {
-                                    color: '#90979c'
-                                }
-                            },
-                            splitLine: {
-                                show: true,
-                                lineStyle: {
-                                    color: '#ccc'
-                                }
-                            },
-                            axisLabel: {}
-                        },
-                        "dataZoom": [{
-                            "show": true,
-                            "height": 12,
-                            "xAxisIndex": [
-                                0
-                            ],
-                            bottom: '8%',
-                            "start": 10,
-                            "end": 90,
-                            handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
-                            handleSize: '110%',
-                            handleStyle: {
-                                color: "#d3dee5",
-
-                            },
-                            textStyle: {
-                                color: "#90979c"
-                            },
-                            borderColor: "#90979c"
-                        }, {
-                            "type": "inside",
-                            "show": true,
-                            "height": 15,
-                            "start": 1,
-                            "end": 35
-                        }],
-                        series: [{
-                            name: '出院人数',
-                            type: 'bar',
-                            barWidth: '15%',
-                            itemStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                        offset: 0,
-                                        color: '#fccb05'
-                                    }, {
-                                        offset: 1,
-                                        color: '#f5804d'
-                                    }]),
-                                    barBorderRadius: 12,
-                                },
-                            },
-                            data: outArr
-                        },
-                            {
-                                name: '已归档',
-                                type: 'bar',
-                                barWidth: '15%',
-                                itemStyle: {
-                                    normal: {
-                                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                            offset: 0,
-                                            color: '#8bd46e'
-                                        }, {
-                                            offset: 1,
-                                            color: '#09bcb7'
-                                        }]),
-                                        barBorderRadius: 11,
-                                    }
-
-                                },
-                                data: fileArr
-                            },
-                            {
-                                name: '未归档',
-                                type: 'bar',
-                                barWidth: '15%',
-                                itemStyle: {
-                                    normal: {
-                                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                            offset: 0,
-                                            color: '#248ff7'
-                                        }, {
-                                            offset: 1,
-                                            color: '#6851f1'
-                                        }]),
-                                        barBorderRadius: 11,
-                                    }
-                                },
-                                data: unFileArr
-                            }, {
-                                name: '死亡人数',
-                                type: 'bar',
-                                barWidth: '15%',
-                                itemStyle: {
-                                    normal: {
-                                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                                            offset: 0,
-                                            color: '#DBDB70'
-                                        }, {
-                                            offset: 1,
-                                            color: '#EAEAAE'
-                                        }]),
-                                        barBorderRadius: 11,
-                                    }
-
-                                },
-                                data: deathArr
-                            },]
-                    };
-
-                    var app = {
-                        currentIndex: -1,
-                    };
-                    setInterval(function () {
-                        var dataLen = optionOne.series[0].data.length;
-
-                        // 取消之前高亮的图形
-                        myChartOne.dispatchAction({
-                            type: 'downplay',
-                            seriesIndex: 0,
-                            dataIndex: app.currentIndex
-                        });
-                        app.currentIndex = (app.currentIndex + 1) % dataLen;
-                        //console.log(app.currentIndex);
-                        // 高亮当前图形
-                        myChartOne.dispatchAction({
-                            type: 'highlight',
-                            seriesIndex: 0,
-                            dataIndex: app.currentIndex,
-                        });
-                        // 显示 tooltip
-                        myChartOne.dispatchAction({
-                            type: 'showTip',
-                            seriesIndex: 0,
-                            dataIndex: app.currentIndex
-                        });
-
-
-                    }, 1000);
-                    optionTwo = {
-                        backgroundColor: '#ECF0F5',
-                        title: {
-                            text: '归档率变化',
-                            textStyle: {
-                                color: "#ccc"
-                            }
-                        },
-                        tooltip: {
-                            trigger: 'axis'
-                        },
-                        legend: {
-                            data: ['归档率%', '2日归档率%', '3日归档率%', '7日归档率%'],
-                            textStyle: {
-                                color: "#000"
-                            }
-                        },
-                        grid: {
-                            top: 'middle',
-                            left: '3%',
-                            right: '4%',
-                            bottom: '3%',
-                            height: '80%',
-                            containLabel: true
-                        },
-                        toolbox: {
-                            show: true,
-                            feature: {
-                                mark: {show: true},
-                                //dataView: {show: true, readOnly: false},
-                                magicType: {show: true, type: ['line', 'bar']},
-                                restore: {show: true},
-                                saveAsImage: {show: true}
-                            }
-                        },
-                        calculable: true,
-                        xAxis: [
-                            {
-                                type: 'category',
-                                boundaryGap: false,
-                                data: deptArr,
-                                axisTick: {
-                                    show: true //隐藏X轴刻度
-                                },
-                                axisLabel: {
-                                    show: true,
-                                    textStyle: {
-                                        color: "#000" //X轴文字颜色
-                                    }
-                                },
-                            }
-                        ],
-                        yAxis: [
-                            {
-                                type: 'value',
-                                name: "%",
-                                nameTextStyle: {
-                                    color: "#000"
-                                },
-                                axisLabel: {
-                                    formatter: '{value}%'
-                                },
-                                axisLabel: {
-                                    show: true,
-                                    textStyle: {
-                                        color: "#000"
-                                    }
-                                },
-                                splitLine: {
-                                    lineStyle: {
-                                        type: 'dashed',
-                                        color: '#DDD'
-                                    }
-                                },
-                            }
-                        ],
-                        "dataZoom": [{
-                            "show": true,
-                            "height": 12,
-                            "xAxisIndex": [
-                                0
-                            ],
-                            bottom: '8%',
-                            "start": 10,
-                            "end": 90,
-                            handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
-                            handleSize: '110%',
-                            handleStyle: {
-                                color: "#d3dee5",
-
-                            },
-                            textStyle: {
-                                color: "#90979c"
-                            },
-                            borderColor: "#90979c"
-                        }, {
-                            "type": "inside",
-                            "show": true,
-                            "height": 15,
-                            "start": 1,
-                            "end": 35
-                        }],
-                        series: [
-                            {
-                                name: '归档率%',
-                                type: 'line',
-                                min: 10,
-                                max: 100,
-                                data: arr,
-                                lineStyle: {
-                                    normal: {
-                                        width: 5,
-                                        color: {
-                                            type: 'linear',
-
-                                            colorStops: [{
-                                                offset: 0,
-                                                color: '#9F5F9F' // 0% 处的颜色
-                                            },
-                                                {
-                                                    offset: 0.4,
-                                                    color: '#9F5F9F' // 100% 处的颜色
-                                                }, {
-                                                    offset: 1,
-                                                    color: '#9F5F9F' // 100% 处的颜色
-                                                }
-                                            ],
-                                            globalCoord: false // 缺省为 false
-                                        },
-                                        shadowColor: 'rgba(71,216,190, 0.5)',
-                                        shadowBlur: 10,
-                                        shadowOffsetY: 7
-                                    }
-                                },
-                                itemStyle: {
-                                    normal: {
-                                        color: '#9F5F9F',
-                                        borderWidth: 10,
-                                        borderColor: "#AAF487"
-                                    }
-                                },
-                                smooth: true,
-                                markLine: {
-                                    data: [
-                                        {type: 'average', name: '平均值'}
-                                    ]
-                                }
-                            },
-                            {
-                                name: '2日归档率%',
-                                type: 'line',
-                                min: 10,
-                                max: 100,
-                                data: day2Arr,
-                                lineStyle: {
-                                    normal: {
-                                        width: 5,
-                                        color: {
-                                            type: 'linear',
-
-                                            colorStops: [{
-                                                offset: 0,
-                                                color: '#F6D06F' // 0% 处的颜色
-                                            },
-                                                {
-                                                    offset: 0.4,
-                                                    color: '#F9A589' // 100% 处的颜色
-                                                }, {
-                                                    offset: 1,
-                                                    color: '#F9A589' // 100% 处的颜色
-                                                }
-                                            ],
-                                            globalCoord: false // 缺省为 false
-                                        },
-                                        shadowColor: 'rgba(249,165,137, 0.5)',
-                                        shadowBlur: 10,
-                                        shadowOffsetY: 7
-                                    }
-                                },
-
-                                itemStyle: {
-                                    normal: {
-                                        color: '#F6D06F',
-                                        borderWidth: 10,
-                                        borderColor: "#F6D06F"
-                                    }
-                                },
-                                smooth: true,
-                                markLine: {
-                                    data: [
-                                        {type: 'average', name: '平均值'}
-                                    ]
-                                }
-                            }
-                            ,
-                            {
-                                name: '3日归档率%',
-                                type: 'line',
-                                min: 10,
-                                max: 100,
-                                data: day3Arr,
-                                lineStyle: {
-                                    normal: {
-                                        width: 5,
-                                        color: {
-                                            type: 'linear',
-
-                                            colorStops: [{
-                                                offset: 0,
-                                                color: '#C6D06F' // 0% 处的颜色
-                                            },
-                                                {
-                                                    offset: 0.4,
-                                                    color: '#C6D06F' // 100% 处的颜色
-                                                }, {
-                                                    offset: 1,
-                                                    color: '#C6D06F' // 100% 处的颜色
-                                                }
-                                            ],
-                                            globalCoord: false // 缺省为 false
-                                        },
-                                        shadowColor: 'rgba(249,165,137, 0.5)',
-                                        shadowBlur: 10,
-                                        shadowOffsetY: 7
-                                    }
-                                },
-                                itemStyle: {
-                                    normal: {
-                                        color: '#C6D06F',
-                                        borderWidth: 10,
-                                        /*shadowColor: 'rgba(72,216,191, 0.3)',
-                                         shadowBlur: 100,*/
-                                        borderColor: "#F6D06F"
-                                    }
-                                },
-                                smooth: true,
-                                markLine: {
-                                    data: [
-                                        {type: 'average', name: '平均值'}
-                                    ]
-                                }
-                            }
-                            ,
-                            {
-                                name: '7日归档率%',
-                                type: 'line',
-                                min: 10,
-                                max: 100,
-                                data: day7Arr,
-                                lineStyle: {
-                                    normal: {
-                                        width: 5,
-                                        color: {
-                                            type: 'linear',
-
-                                            colorStops: [{
-                                                offset: 0,
-                                                color: '#06D06F' // 0% 处的颜色
-                                            },
-                                                {
-                                                    offset: 0.4,
-                                                    color: '#06D06F' // 100% 处的颜色
-                                                }, {
-                                                    offset: 1,
-                                                    color: '#06D06F' // 100% 处的颜色
-                                                }
-                                            ],
-                                            globalCoord: false // 缺省为 false
-                                        },
-                                        shadowColor: 'rgba(249,165,137, 0.5)',
-                                        shadowBlur: 10,
-                                        shadowOffsetY: 7
-                                    }
-                                },
-                                itemStyle: {
-                                    normal: {
-                                        color: '#06D06F',
-                                        borderWidth: 10,
-                                        /*shadowColor: 'rgba(72,216,191, 0.3)',
-                                         shadowBlur: 100,*/
-                                        borderColor: "#F6D06F"
-                                    }
-                                },
-                                smooth: true,
-                                markLine: {
-                                    data: [
-                                        {type: 'average', name: '平均值'}
-                                    ]
-                                }
-                            }
-                        ]
-                    };
-                }
-                //使用制定的配置项和数据显示图表
-                myChartOne.setOption(optionOne);
-                //使用制定的配置项和数据显示图表
-                myChartTwo.setOption(optionTwo);
-            }
-        });
-    });
-
-    function initTable() {
-        if (tipLoad == 1) {
-            $("#table").bootstrapTable({ // 对应table标签的id
-                //method: 'POST',
-                url: "${path}/vCount/vCountList", // 获取表格数据的url
-                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
-                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                striped: true,  //表格显示条纹，默认为false
-                pagination: true, // 在表格底部显示分页组件，默认false
-                paginationShowPageGo: true,
-                pageList: [5, 10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                sidePagination: 'server', // 设置为服务器端分页     客户端：client
-                search: false,
-                showColumns: true,
-                toolbar: '#toolbar',//指定工具栏
-                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                undefinedText: '--', //当数据为 undefined 时显示的字符
-                singleSelect: false,//设置True 将禁止多选
-                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                //height: getHeight(197),     //定义表格的高度。
-                searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
-                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                showHeader: true,//是否显示列头。
-                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                //是否显示导出按钮
-                showExport: true,
-                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
-                exportDataType: "basic",
-                //导出文件类型
-                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
-                exportOptions: {
-                    fileName: document.title
-                },
-                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 deptName = $("#deptName").val();
-                    if (deptName.indexOf("") != -1) {
-                        deptName = "";
-                    } else {
-                        deptName = $("#deptName").val().toString();
-                    }
-                    var temp = {
-                        limit: limit,     //页面大小
-                        offset: offset,   //页码
-                        //order: params.order,      //排位命令（desc，asc）
-                        deptCode: deptName.toString(),
-                        startDate: $("#startDate").val(),
-                        endDate: $("#endDate").val(),
-
-                    };
-                    return temp;
-                },
-                sortName: 'id', // 要排序的字段
-                sortOrder: 'desc', // 排序规则
-                columns: [{
-                    title: '全选',
-                    field: 'select',   //复选框
-                    checkbox: true,
-                    width: 25,
-                    align: 'center',
-                    valign: 'middle',
-                },
-                    {
-                        title: '序号',
-                        field: 'id',
-                        align: 'center',
-                        valign: 'middle',
-                        //sortable: true,
-                        // visible: false,
-                        formatter: function (value, row, index) {
-                            return index + 1;
-                        }
-                    },
-                    {
-                        title: '科室代码',
-                        field: 'deptCode',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '科室名称',
-                        field: 'deptName',
-                        align: 'left',
-                        valign: 'middle',
-                    },
-                    // {
-                    //     title: '在院人数',
-                    //     field: 'inNum',
-                    //     align: 'center',
-                    //     valign: 'middle',
-                    // },
-                    {
-                        title: '出院人数',
-                        field: 'outNum',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '已归档',
-                        field: 'fileNum',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '未归档',
-                        field: 'unfileNum',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '死亡人数',
-                        field: 'deathNum',
-                        align: 'center',
-                        valign: 'middle',
-                    },
-                    {
-                        title: '归档率%',
-                        field: 'fileRate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            var val;
-                            if (row.fileRate != null && row.fileRate != '') {
-                                val = Math.round(row.fileRate * 100) + "%";
-                            }
-                            return val;
-                        }
-                    },
-                    {
-                        title: '2日归档率%',
-                        field: 'day2Rate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            var val;
-                            if (row.day2Rate != null && row.day2Rate != '') {
-                                val = Math.round(row.day2Rate * 100) + "%";
-                            }
-                            return val;
-                        }
-                    },
-                    {
-                        title: '3日归档率%',
-                        field: 'day3Rate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            var val;
-                            if (row.day3Rate != null && row.day3Rate != '') {
-                                val = Math.round(row.day3Rate * 100) + "%";
-                            }
-                            return val;
-                        }
-                    },
-                    {
-                        title: '7日归档率%',
-                        field: 'day7Rate',
-                        align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            var val;
-                            if (row.day7Rate != null && row.day7Rate != '') {
-                                val = Math.round(row.day7Rate * 100) + "%";
-                            }
-                            return val;
-                        }
-                    }
-                ],
-                onLoadSuccess: function (result) {  //加载成功时执行
-                    $(".page-list").show();
-                    tipLoad = 0;
-                    reloadTableHeight("table");
-                },
-                onLoadError: function () {  //加载失败时执行
-                    tipLoad = 0;
-                }
-            });
-        }
-    }
-
-    //查询
-    $('#searchBtn').click(function () {
-        //查询之后重新从第一页算起
-        if (tipLoad == 0) {
-            $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
-        } else {
-            toastr.warning("正在查询，请稍等...");
-        }
-    });
-
-    initTable();
-
-    //2.初始化select的change事件
-    $("#sel_exportoption").change(function () {
-        $('#table').bootstrapTable('refreshOptions', {
-            exportDataType: $(this).val()
-        });
-    });
-    $("#refreshBtn").click(function () {
-        //刷新
-        $('#table').bootstrapTable('refresh');
-    });
-
-    //导出excel功能
-    $("#excelBtn").click(function () {
-        //获取选中数据记录
-        var idlist = $('#table').bootstrapTable('getAllSelections');
-        var sql = '';//AND (deptName = '222' or deptName = '333')
-        if (idlist.length > 0) {
-            for (var i = 0; i < idlist.length; i++) {
-                if (idlist.length == 1) {
-                    sql += "AND (deptName = '" + idlist[i].deptName + "')";
-                } else {
-                    if (i == 0) {
-                        sql += "AND (deptName = '" + idlist[i].deptName + "') or ";
-                    } else if (i != idlist.length - 1) {
-                        sql += "(deptName = '" + idlist[i].deptName + "') or ";
-                    } else if (i == idlist.length - 1) {
-                        sql += "(deptName = '" + idlist[i].deptName + "')";
-                    }
-                }
-            }
-        }
-        var deptName = $("#deptName").val();
-        if (deptName.indexOf("") != -1) {
-            deptName = "";
-        } else {
-            deptName = $("#deptName").val().toString();
-        }
-        var startDate = $("#startDate").val();
-        var endDate = $("#endDate").val();
-        window.location.href = "${path}/vCount/exportExcel?deptCode=" + deptName + "&startDate=" + startDate
-            + "&endDate=" + endDate + "&sql=" + sql;
-    });
-    //导出excel功能
-    $("#excelBtn2").click(function () {
-        //var deptName = "" + $("#deptName").val();
-        var deptName = $("#deptName").val();
-        if (deptName.indexOf("") != -1) {
-            deptName = "";
-        } else {
-            deptName = $("#deptName").val().toString();
-        }
-        var startDateTo = $("#startDate").val();
-        var endDateTo = $("#endDate").val();
-
-        window.location.href = "${path}/vCount/exportExcel2?deptName=" + deptName + "&startDateTo=" + startDateTo
-            + "&endDateTo=" + endDateTo;
-    });
 </script>
+<script src="${path}/static/js/vCount/vCountList.js?time=2020-08-18"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/css/comm.css b/src/main/webapp/static/css/comm.css
index 3982731..301701f 100644
--- a/src/main/webapp/static/css/comm.css
+++ b/src/main/webapp/static/css/comm.css
@@ -4,6 +4,24 @@ body {
     padding: 0;
     margin: 0;
 }
+/**
+    外层div
+ */
+.mainBody{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: #ecf0f5;
+    padding: 10px;
+}
+/**
+    里层div
+ */
+.main{
+    background-color: white;
+    min-height: calc(100vh - 20px);
+    border-radius: 5px;
+}
 .mainDiv{
     margin-left:15px;
     margin-right:15px;
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index a79da95..08def58 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -1,6 +1,8 @@
 var tipLoad = 1;
 //列表复选框选中数组
 var selects = '';
+//定义表格内容最大高度
+var maxHeight = 0;
 //出院列表
 function initTable() {
     if (tipLoad == 1) {
diff --git a/src/main/webapp/static/js/comm.js b/src/main/webapp/static/js/comm.js
index d4dce50..a61a367 100644
--- a/src/main/webapp/static/js/comm.js
+++ b/src/main/webapp/static/js/comm.js
@@ -101,9 +101,17 @@ function getHeight(height) {
 }
 //重设表格高度
 function reloadTableHeight(tableId) {
+    //获取表格内容高度
     var height = $(".fixed-table-body #"+tableId).height();
-    $("#"+tableId+".fixed-table-container").css({ "padding-bottom": "0px", height: height + 20 });
+    //刷新
     $('#'+tableId).bootstrapTable('resetView', { height: "auto" });
+    //计算body所需高度
+    var tableBodyHeight = height-6;
+    //赋值body高度，且定义最高高度
+    if(maxHeight == 0){
+        maxHeight = tableBodyHeight;
+    }
+    $(".fixed-table-body").css({height:tableBodyHeight,"max-height":maxHeight});
 }
 
 //加载时段
diff --git a/src/main/webapp/static/js/faultList/faultList.js b/src/main/webapp/static/js/faultList/faultList.js
new file mode 100644
index 0000000..42995ca
--- /dev/null
+++ b/src/main/webapp/static/js/faultList/faultList.js
@@ -0,0 +1,297 @@
+$('.bs-select').selectpicker({});
+$('#deptDiv').selectpicker({
+    size: 4
+});
+var tipLoad = 1;
+
+//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
+function DoOnCellHtmlData(cell, row, col, data) {
+    if (row == 0) {
+        return data;
+    }
+    //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
+    if (col == 4 || col == 11 || col == 7) {
+        var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
+        var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
+        //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
+        if (typeof (title) != 'undefined') {
+            return title;
+        }
+    }
+    return data;
+}
+//定义表格内容最大高度
+var maxHeight = 0;
+function initTable() {
+    if (tipLoad == 1) {
+        $("#table").bootstrapTable({ // 对应table标签的id
+            //method: 'POST',
+            url: path+"/fault/faultList", // 获取表格数据的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 则显示所有记录。
+            sidePagination: 'server', // 设置为服务器端分页     客户端：client
+            search: false,
+            showColumns: true,
+            toolbar: '#toolbar',//指定工具栏
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '---', //当数据为 undefined 时显示的字符
+            singleSelect: false,//设置True 将禁止多选
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            //height: getHeight(219),     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            //是否显示导出按钮
+            showExport: true,
+            //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+            exportDataType: "basic",
+            //导出文件类型
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+            exportOptions: {
+                fileName: document.title
+            },
+            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 url = window.location.href;
+                var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+                var len = ($("#deptName").val()).length;
+                if (len > 0) {
+                    var deptNameT = $("#deptName").val();
+                    if (deptNameT.indexOf("") == -1) {
+                        deptName = $("#deptName").val().toString();
+                    }
+                }
+                var temp = {
+                    limit: limit,     //页面大小
+                    offset: offset,   //页码
+                    order: params.order,      //排位命令（desc，asc）
+                    startDate: $("#startDateTo").val(),
+                    endDate: $("#endDateTo").val(),
+                    inpNo: "" + $("#inpNo").val(),
+                    visitId: "" + $("#visitId").val(),
+                    name: "" + $("#name").val(),
+                    archivestate: "" + $("#archivestate").val(),
+                    deptName: deptName.toString(),
+                    isSearch: $("#isSearch").val()
+                };
+                return temp;
+            },
+            sortName: 'id', // 要排序的字段
+            sortOrder: 'desc', // 排序规则
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'left',
+                valign: 'middle',
+            },
+                {
+                    title: '序号',
+                    field: 'id',
+                    align: 'center',
+                    valign: 'middle',
+                    //field: 'ID',
+                    // visible: false,
+                    formatter: function (value, row, index) {
+                        return index + 1;
+                    }
+                },
+                {
+                    title: '住院号',
+                    field: 'inpNo',
+                    valign: 'middle',
+                    //sortable: true,
+                },
+                {
+                    title: '住院次数',
+                    field: 'visitId',
+                    valign: 'middle',
+                    align: 'center'
+                },
+                {
+                    title: '姓名',
+                    field: 'name',
+                    valign: 'middle',
+                },
+                {
+                    title: '出院科室',
+                    field: 'deptName',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '出院日期',
+                    field: 'dischargeDateTime',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return operDisDate(value);
+                    }
+                },
+                {
+                    title: '归档状态',
+                    field: 'archivestate',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        //在院  未归档  归档中  初审 已归档 已认证 复审退回
+                        var a = '';
+                        if (value == "已归档") {
+                            a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        } else {
+                            a = '<span style="color:#c0c0c0;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未归档</span>';
+                        }
+                        return a;
+                    }
+                },
+                {
+                    field: 'score',
+                    title: '评分(分)',
+                    //sortable: true,
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return value;
+                        //return changeDateFormat(value)
+                    }
+                },
+                {
+                    field: 'backContent',
+                    title: '退回内容',
+                    formatter: function (value, row, index) {
+                        return value;
+                        //return changeDateFormat(value)
+                    }
+                },
+                {
+                    field: 'assortId',
+                    title: '缺陷选项',
+                    valign: 'middle',
+                    formatter: function (value) {
+                        return '<p class="hidden-xs" title="' + value + '">' + value + '</p>';
+                    }
+                },
+                {
+                    field: 'content',
+                    title: '缺陷自定内容',
+                    valign: 'middle',
+                    formatter: function (value) {
+                        return value;
+                    }
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    valign: 'middle',
+                    formatter: function (value) {
+                        return value;
+                        //return changeDateFormat(value)
+                    }
+                },
+                {
+                    field: 'creater',
+                    title: '创建人',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return value;
+                    }
+                },
+            ],
+            onLoadSuccess: function (result) {  //加载成功时执行
+                //console.info("加载成功");
+                $(".page-list").show();
+                tipLoad = 0;
+                reloadTableHeight("table");
+            },
+            onLoadError: function () {  //加载失败时执行
+                //console.info("加载数据失败");
+                tipLoad = 0;
+            }
+        });
+    }
+}
+
+$(function () {
+    getDept();
+    var url = window.location.href;
+    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    if (index != null && index != "" && index.indexOf("excel") != -1) {
+        $("#excelBtn").show();
+        $("#toolbar").show();
+    } else {
+        $("#excelBtn").hide();
+        $(".columns-right").hide();
+    }
+    var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+    var deptArr = deptAdmissionTo.split(',');
+    //var n = (deptAdmissionTo.split(',')).length ;
+    if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
+        $('#deptDiv').show();
+    } else {
+        $('#deptDiv').hide();
+    }
+});
+initTable();
+//2.初始化select的change事件
+$("#sel_exportoption").change(function () {
+    $('#table').bootstrapTable('refreshOptions', {
+        exportDataType: $(this).val()
+    });
+});
+$("#refreshBtn").click(function () {
+    //刷新
+    $('#table').bootstrapTable('refresh');
+});
+
+//导出excel功能
+$("#excelBtn").click(function () {
+    var inpNo = $("#inpNo").val();
+    var visitId = $("#visitId").val();
+    var name = $("#name").val();
+    var startDate = $("#startDateTo").val();
+    var endDate = $("#endDateTo").val();
+    var archivestate = $("#archivestate").val();
+
+    var url = window.location.href;
+    var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+    var len = ($("#deptName").val()).length;
+    if (len > 0) {
+        var deptNameT = $("#deptName").val();
+        if (deptNameT.indexOf("") == -1) {
+            deptName = $("#deptName").val().toString();
+        }
+    }
+    var isSearch = $("#isSearch").val();
+    var url = path+"/fault/exportExcel";
+    post(url, {
+        "inpNo": inpNo,
+        "visitId": visitId,
+        "name": name,
+        "deptName": deptName,
+        "startDate": startDate,
+        "endDate": endDate,
+        "isSearch": isSearch,
+        "archivestate": archivestate
+    });
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/flowInfo/flowInfoList.js b/src/main/webapp/static/js/flowInfo/flowInfoList.js
index 91a02c7..4337cdc 100644
--- a/src/main/webapp/static/js/flowInfo/flowInfoList.js
+++ b/src/main/webapp/static/js/flowInfo/flowInfoList.js
@@ -1,8 +1,9 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     getDept();
 })
-
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/holidaySet/holidaySetList.js b/src/main/webapp/static/js/holidaySet/holidaySetList.js
index a04c940..d6fc5cc 100644
--- a/src/main/webapp/static/js/holidaySet/holidaySetList.js
+++ b/src/main/webapp/static/js/holidaySet/holidaySetList.js
@@ -1,3 +1,5 @@
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function () {
     initDateInput(1);
     initDateInput(2);
diff --git a/src/main/webapp/static/js/inHospList/inHospList.js b/src/main/webapp/static/js/inHospList/inHospList.js
new file mode 100644
index 0000000..be00b53
--- /dev/null
+++ b/src/main/webapp/static/js/inHospList/inHospList.js
@@ -0,0 +1,339 @@
+//识别是否加载
+var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
+$(function () {
+    getChecker();
+    var url = window.location.href;
+    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    if (index != null && index != "" && index.indexOf("excel") != -1) {
+        $("#excelBtn").show();
+        $("#toolbar").show();
+    } else {
+        $("#excelBtn").hide();
+        $(".columns-right").hide();
+    }
+    if (index != null && index != "" && index.indexOf("upload") != -1) {
+        $("#uploadBtn").show();
+    } else {
+        $("#uploadBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("pdf") != -1) {
+        $("#pdfBtn").show();
+    } else {
+        $("#pdfBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("pdf2") != -1) {
+        $("#pdfBtn2").show();
+    } else {
+        $("#pdfBtn2").hide();
+    }
+    if (index != null && index != "" && index.indexOf("cancelAll") != -1) {
+        $("#updateStateBtn").show();
+    } else {
+        $("#updateStateBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("useAll") != -1) {
+        $("#updateStateBtn2").show();
+    } else {
+        $("#updateStateBtn2").hide();
+    }
+    var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+    var deptArr = deptAdmissionTo.split(',');
+    if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
+        $('#deptDiv').show();
+    } else {
+        $('#deptDiv').hide();
+    }
+});
+
+function initTable() {
+    if (tipLoad == 1) {
+        $("#table").bootstrapTable({ // 对应table标签的id
+            //method: 'POST',
+            url: path+"/inHosp/inHospitalList", // 获取表格数据的url
+            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
+            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+            striped: true,  //是否显示行间隔色
+            pagination: true, // 在表格底部显示分页组件，默认false
+            paginationShowPageGo: true,
+            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+            sidePagination: 'server', // 设置为服务器端分页     客户端：client
+            search: false,
+            showColumns: true,
+            toolbar: '#toolbar',//指定工具栏
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '---', //当数据为 undefined 时显示的字符
+            singleSelect: false,//设置True 将禁止多选
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            //height: getHeight(220),     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            //是否显示导出按钮
+            showExport: true,
+            //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+            exportDataType: "basic",
+            //导出文件类型
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+            exportOptions: {
+                fileName: document.title
+            },
+            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 url = window.location.href;
+                var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+                var len = ($("#deptName").val()).length;
+                if (len > 0) {
+
+                    var deptName = $("#deptName").val();
+                    if (deptName.indexOf("") != -1) {
+                        if (deptAdmissionTo != null && deptAdmissionTo != '') {
+                            deptAdmissionTo += "," + $("#deptAdmissionTo").val();
+                        } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
+                            deptAdmissionTo = $("#deptAdmissionTo").val();
+                        }
+                    } else {
+                        deptAdmissionTo = $("#deptName").val().toString();
+                    }
+                } else {
+                    if (deptAdmissionTo != null && deptAdmissionTo != '') {
+                        deptAdmissionTo += "," + $("#deptAdmissionTo").val();
+                    } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
+                        deptAdmissionTo = $("#deptAdmissionTo").val();
+                    }
+                }
+                var temp = {
+                    limit: limit,     //页面大小
+                    offset: offset,   //页码
+                    order: params.order,      //排位命令（desc，asc）
+                    id: $("#id").val(),
+                    idNo: $("#idNo").val(),
+                    inpNo: "" + $("#inpNo").val(),
+                    visitId: "" + $("#visitId").val(),
+                    name: "" + $("#name").val(),
+                    //deptName: "" + $("#deptName").val(),
+                    archivestate: "在院",
+                    startDateTo: $("#startDateTo").val(),
+                    endDateTo: $("#endDateTo").val(),
+                    deptAdmissionTo: deptAdmissionTo,
+                    doctorInCharge: $("#doctorInCharge").val(),
+                    isSearch: $("#isSearch").val()
+                };
+                return temp;
+            },
+            sortName: 'id', // 要排序的字段
+            sortOrder: 'desc', // 排序规则
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'center',
+                valign: 'middle',
+
+            },
+                {
+                    title: '住院号',
+                    field: 'inpNo',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '住院次数',
+                    field: 'visitId',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '姓名',
+                    field: 'name',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '性别',
+                    field: 'sex',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '身份证号',
+                    field: 'idNo',
+                    align: 'center',
+                    valign: 'middle',
+                    visible: false
+                },
+                {
+                    title: '当前科室',
+                    field: 'deptName',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '入院日期',
+                    field: 'admissionDateTime',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return operDisDate(value);
+                    }
+                },
+                {
+                    title: '主管医生',
+                    field: 'doctorInCharge',
+                    align: 'left',
+                },
+                {
+                    title: '状态',
+                    field: 'archivestate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function () {
+                        //在院  未归档  归档中  初审 已归档 已认证
+                        return '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>在院</span>';
+                    }
+                },
+                {
+                    title: "操作",
+                    align: 'left',
+                    valign: 'middle',
+                    width: 80, // 定义列的宽度，单位为像素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("select") != -1) {
+                            //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
+                            html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看 </button>';// '<a href="javascript:;" class="delete">删除</a>';
+                        }
+                        return html;
+
+                    }, events: {
+                        'click .selInfo': function (e, value, row, index) {
+                            //查询是否医生或护士是否提交
+                            var result = 1;
+                            //result = selectHis(row);
+                            if (result == 1) {
+                            } else if (result == -1) {
+                                toastr.warning("系统出错了请联系系统管理员");
+                            } else {
+                                toastr.warning('医生或护士未提交数据，请稍后再试');
+                            }
+                            $('#selModal').modal({
+                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                                keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                                show: true//弹出对话框
+                            });
+                            //删除缓存
+                            //删除病历清单分段树选中
+                            $("#assortId").html(0);
+                            //删除病历清单查看单个pdf复选框选中信息
+                            idArr = [];
+                            //同步
+                            $("#idLab").html(row.id);
+                            $("#nameLab").html(row.name);
+                            //入院
+                            if (row.admissionDateTime != null && row.admissionDateTime != '') {
+                                $("#inDateLab").html(operDisTime(row.admissionDateTime));
+                            }
+                            $("#chargeLab").html(row.doctorInCharge);
+                            $("#deptToLab").html(row.deptAdmissionTo);
+                            $("#outHospLab").html(row.dischargeDisposition);
+                            //出院
+                            if (row.dischargeDateTime != null && row.dischargeDateTime != '') {
+                                $("#inDateLab1").html(operDisTime(row.dischargeDateTime));
+                            }
+                            $("#deptToLab1").html(row.deptName);
+
+                            $("#inLab").html(row.inpNo);
+                            $("#inTimeLab").html(row.visitId);
+                            //入/出院年+出院月+住院号+住院次数
+                            var outDate = "";
+                            if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
+                                outDate = row.dischargeDateTime.split("-");
+                            } else if (row.admissionDateTime != null && row.admissionDateTime == "") {
+                                outDate = row.admissionDateTime.split("-");
+                            }
+                            $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
+                            initTree(row.id, $("#checker").val());
+                        }
+                    },
+                    cellStyle: function (value, row, index) {
+                        return {classes: 'success'}
+                    }
+                }
+            ],
+            onLoadSuccess: function (result) {  //加载成功时执行
+                // console.info("加载成功");
+                $(".page-list").show();
+                tipLoad = 0;
+                reloadTableHeight("table");
+            },
+            onLoadError: function () {  //加载失败时执行
+                //console.info("加载数据失败");
+                tipLoad = 0;
+            }
+        });
+    }
+}
+
+//导出excel功能
+$("#excelBtn").click(function () {
+    var doctorInCharge = $("#doctorInCharge").val();
+    var inpNo = $("#inpNo").val();
+    var visitId = $("#visitId").val();
+    var name = $("#name").val();
+    var startDateTo = $("#startDateTo").val();
+    var endDateTo = $("#endDateTo").val();
+    var url = window.location.href;
+    var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+    var len = ($("#deptName").val()).length;
+    if (len > 0) {
+        var deptName = $("#deptName").val();
+        if (deptName.indexOf("") != -1) {
+            if (deptAdmissionTo != null && deptAdmissionTo != '') {
+                deptAdmissionTo += "," + $("#deptAdmissionTo").val();
+            } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
+                deptAdmissionTo = $("#deptAdmissionTo").val();
+            }
+        } else {
+            deptAdmissionTo = $("#deptName").val().toString();
+        }
+    } else {
+        if (deptAdmissionTo != null && deptAdmissionTo != '') {
+            deptAdmissionTo += "," + $("#deptAdmissionTo").val();
+        } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
+            deptAdmissionTo = $("#deptAdmissionTo").val();
+        }
+    }
+    var isSearch = $("#isSearch").val();
+    var url = path+"/inHosp/exportExcel";
+    post(url, {
+        "doctorInCharge": doctorInCharge,
+        "inpNo": inpNo,
+        "visitId": visitId,
+        "name": name,
+        "deptAdmissionTo": deptAdmissionTo,
+        "deptName": deptName,
+        "startDateTo": startDateTo,
+        "endDateTo": endDateTo,
+        "isSearch": isSearch
+    });
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
index d51c1fe..97159ab 100644
--- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
+++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
@@ -3,6 +3,8 @@ var tipLoad = 1;
 var files = new Array();
 var id = 0;
 var selects = '';
+//定义表格内容最大高度
+var maxHeight = 0;
 //终审列表
 function initTable() {
     if (tipLoad == 1) {
diff --git a/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js b/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js
index 9381b42..f489d7d 100644
--- a/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js
+++ b/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function () {
     getDept();
     var url = window.location.href;
diff --git a/src/main/webapp/static/js/menu.js b/src/main/webapp/static/js/menu.js
index 408ab95..25d0ce4 100644
--- a/src/main/webapp/static/js/menu.js
+++ b/src/main/webapp/static/js/menu.js
@@ -1,3 +1,31 @@
+//系统标识
+var sysFlag = 'emr_medical_record';
+//用户id
+var userId = $("#userId").val();
+//选中菜单设置进浏览器存储
+function setBrowItem(_this){
+    var flag = sysFlag + '_' + userId;
+    //设置a标签id
+    localStorage.setItem(flag,$(_this).prop("id"));
+    localStorage.setItem(flag+"_url",$(_this).prop("href"));
+}
+//取出历史选中并选中
+function getBrowItem(){
+    //取出a标签id
+    var flag = sysFlag + '_' + userId;
+    var hisMenuId = localStorage.getItem(flag);
+    //选中历史菜单节点
+    if(hisMenuId != null && hisMenuId != ''){
+        var dom = $("#"+hisMenuId);
+        if(dom != undefined && dom != null && dom != '') {
+            indexSelected(dom);
+            //取出历史菜单地址跳转历史页面
+            var hisMenuUrl = localStorage.getItem(flag + "_url");
+            $("#iFrame1").prop("src", hisMenuUrl);
+        }
+    }
+}
+//菜单选中方法
 function indexSelected(_this){
     $("#indexTreeMenu li").removeClass("active");
     $("ul.treeview-menu").find("a").removeClass("indexSelected");
@@ -5,6 +33,8 @@ function indexSelected(_this){
     $(_this).addClass("indexSelected");
     $(_this).parent().parent().siblings().addClass('modleSelected');
     $(_this).parent().parent().parent().addClass("active");
+    //设置到缓存
+    setBrowItem(_this);
 }
 /*========================menu========================*/
 function newUlFun(){
@@ -36,15 +66,15 @@ function newAFun(aName, iconCss,defaultModleSelected){
     return newA;
 }
 
-function newAliFun(aName,iconCss,menuUrl,defaultMenuSelected){
-    /*<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li> */
+function newAliFun(aName,iconCss,menuUrl,defaultMenuSelected,j,i){
+    var menuId = sysFlag + "Menu_" + j + "_" + i;
     var newli = $("<li></li> ");
     var newicon=$("<i></i>");
     var newA = '';
     if(defaultMenuSelected){
-        newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\" onclick = 'indexSelected(this)' class='indexSelected'></a>");
+        newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\" onclick = 'indexSelected(this)' class='indexSelected' id='"+menuId+"'></a>");
     }else{
-        newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\" onclick = 'indexSelected(this)'></a>");
+        newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\" onclick = 'indexSelected(this)' id='"+menuId+"'></a>");
     }
 
     newicon.addClass(iconCss);
diff --git a/src/main/webapp/static/js/recallDateList/recallDateList.js b/src/main/webapp/static/js/recallDateList/recallDateList.js
new file mode 100644
index 0000000..d0e4771
--- /dev/null
+++ b/src/main/webapp/static/js/recallDateList/recallDateList.js
@@ -0,0 +1,244 @@
+var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
+$(function () {
+    initDateInput('startDate', 'endDate');
+    //日期控件
+    var url = window.location.href;
+    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    if (index != null && index != "" && index.indexOf("excel") != -1) {
+        $("#excelBtn").show();
+        $("#toolbar").show();
+    } else {
+        $("#excelBtn").hide();
+        $(".columns-right").hide();
+    }
+});
+
+//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
+function DoOnCellHtmlData(cell, row, col, data) {
+    if (row == 0) {
+        return data;
+    }
+    //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
+    if (col == 4 || col == 11 || col == 7) {
+        var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
+        var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
+        //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
+        if (typeof (title) != 'undefined') {
+            return title;
+        }
+    }
+    return data;
+}
+
+function initTable() {
+    if (tipLoad == 1) {
+        $("#table").bootstrapTable({ // 对应table标签的id
+            //method: 'POST',
+            url: path+"/recallDate/recallDateList", // 获取表格数据的url
+            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+            striped: true,  //表格显示条纹，默认为false
+            pagination: true, // 在表格底部显示分页组件，默认false
+            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+            sidePagination: 'server', // 设置为服务器端分页     客户端：client
+            search: false,
+            showColumns: true,
+            paginationShowPageGo: true,
+            // sortable: true,
+            // sortOrder: "asc",
+            toolbar: '#toolbar',//指定工具栏
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '---', //当数据为 undefined 时显示的字符
+            singleSelect: false,//设置True 将禁止多选
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            //height: getHeight(220),     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            //是否显示导出按钮
+            showExport: true,
+            //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+            exportDataType: "basic",
+            //导出文件类型
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+            exportOptions: {
+                fileName: document.title
+            },
+            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 temp = {
+                    limit: limit,     //页面大小
+                    offset: offset,   //页码
+                    order: params.order,      //排位命令（desc，asc）
+                    idNo: $("#idNo").val(),
+                    inpNo: $("#inpNo").val(),
+                    visitId: $("#visitId").val(),
+                    name: $("#name").val(),
+                    archivestate: $("#archivestate").val(),
+                    startDate: $("#startDate").val(),
+                    endDate: $("#endDate").val(),
+                    callbackUserName: $("#creater").val()
+                };
+                return temp;
+            },
+            sortName: 'id', // 要排序的字段
+            sortOrder: 'desc', // 排序规则
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'center',
+                valign: 'middle',
+            },
+                {
+                    title: '序号',
+                    field: 'id',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return index + 1;
+                    }
+                },
+                {
+                    title: '住院号',
+                    field: 'inpNo',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '住院次数',
+                    field: 'visitId',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '姓名',
+                    field: 'name',
+                    valign: 'middle',
+                },
+                {
+                    title: '出院科室',
+                    field: 'deptName',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '召回人',
+                    field: 'callbackUserName',
+                    valign: 'middle',
+                },
+                {
+                    title: '召回时间',
+                    field: 'callbackTime',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value) {
+                        return operDisTime(value);
+                    }
+                },
+                {
+                    title: '召回原因',
+                    field: 'callbackReason',
+                    valign: 'middle',
+                },
+                {
+                    title: '状态',
+                    field: 'status',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function () {
+                        return '<span style="color:#3e8f3e"><i class="fa fa-check-circle-o" aria-hidden="true"></i>已召回</span>';
+                    }
+                },
+                {
+                    title: '归档状态',
+                    field: 'archivestate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value) {
+                        if (value == '已归档') {
+                            return '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>已归档</span>';
+                        } else {
+                            return '<p class="hidden-xs" title="' + value + '" style="color:red">' + value + '</p>'
+                        }
+                    }
+                }
+            ],
+            onLoadSuccess: function (result) {  //加载成功时执行
+                //console.info("加载成功");
+                $(".page-list").show();
+                tipLoad = 0;
+                reloadTableHeight("table");
+            },
+            onLoadError: function () {  //加载失败时执行
+                //console.info("加载数据失败");
+                tipLoad = 0;
+            }
+        });
+    }
+}
+
+//查询
+$('#searchBtn').click(function () {
+    //查询之后重新从第一页算起
+    if (tipLoad == 0) {
+        $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
+    } else {
+        toastr.warning("正在查询，请稍等...");
+    }
+});
+
+initTable();
+
+//2.初始化select的change事件
+$("#sel_exportoption").change(function () {
+    $('#table').bootstrapTable('refreshOptions', {
+        exportDataType: $(this).val()
+    });
+});
+$("#refreshBtn").click(function () {
+    //刷新
+    $('#table').bootstrapTable('refresh');
+});
+
+//导出excel功能
+$("#excelBtn").click(function () {
+    var inpNo = $("#inpNo").val();
+    var visitId = $("#visitId").val();
+    var name = $("#name").val();
+    var idNo = $("#idNo").val();
+    var archivestate = $("#archivestate").val();
+    var startDate = $("#startDate").val();
+    var endDate = $("#endDate").val();
+    var callbackUserName = $("#creater").val()
+    var url = path+"/recallDate/exportExcel";
+    post(url, {
+        "inpNo": inpNo,
+        "visitId": visitId,
+        "name": name,
+        "idNo": idNo,
+        "archivestate": archivestate,
+        "startDate": startDate,
+        "endDate": endDate,
+        "callbackUserName": callbackUserName
+    });
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/statistics/finalStatistics.js b/src/main/webapp/static/js/statistics/finalStatistics.js
index bccf82b..fbe5bae 100644
--- a/src/main/webapp/static/js/statistics/finalStatistics.js
+++ b/src/main/webapp/static/js/statistics/finalStatistics.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js
index e4cb9a2..a9da580 100644
--- a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js
+++ b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     getDept();
 })
diff --git a/src/main/webapp/static/js/statistics/firstStatistics.js b/src/main/webapp/static/js/statistics/firstStatistics.js
index 2edea66..33383cf 100644
--- a/src/main/webapp/static/js/statistics/firstStatistics.js
+++ b/src/main/webapp/static/js/statistics/firstStatistics.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/printCount.js b/src/main/webapp/static/js/statistics/printCount.js
index adf987b..afc9202 100644
--- a/src/main/webapp/static/js/statistics/printCount.js
+++ b/src/main/webapp/static/js/statistics/printCount.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/printInfo.js b/src/main/webapp/static/js/statistics/printInfo.js
index 2e963cb..d153d8b 100644
--- a/src/main/webapp/static/js/statistics/printInfo.js
+++ b/src/main/webapp/static/js/statistics/printInfo.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/recordStatistics.js b/src/main/webapp/static/js/statistics/recordStatistics.js
index b2a1344..eedd753 100644
--- a/src/main/webapp/static/js/statistics/recordStatistics.js
+++ b/src/main/webapp/static/js/statistics/recordStatistics.js
@@ -1,5 +1,7 @@
 var tipLoad = 0;
 var url = path + '/statistics/recordStatistics/';
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     //加载科室
     getDeptStatistics();
diff --git a/src/main/webapp/static/js/statistics/scanCount.js b/src/main/webapp/static/js/statistics/scanCount.js
index 0ba7ce0..79ff2bf 100644
--- a/src/main/webapp/static/js/statistics/scanCount.js
+++ b/src/main/webapp/static/js/statistics/scanCount.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/scanInfo.js b/src/main/webapp/static/js/statistics/scanInfo.js
index 3e24856..600aafa 100644
--- a/src/main/webapp/static/js/statistics/scanInfo.js
+++ b/src/main/webapp/static/js/statistics/scanInfo.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
diff --git a/src/main/webapp/static/js/statistics/statisticsDetail.js b/src/main/webapp/static/js/statistics/statisticsDetail.js
index b8540a4..773c7fc 100644
--- a/src/main/webapp/static/js/statistics/statisticsDetail.js
+++ b/src/main/webapp/static/js/statistics/statisticsDetail.js
@@ -1,4 +1,6 @@
 var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     getDept();
 })
diff --git a/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js
new file mode 100644
index 0000000..3a3490a
--- /dev/null
+++ b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js
@@ -0,0 +1,356 @@
+var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
+$(function () {
+    getChecker();
+    var url = window.location.href;
+    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    if (index != null && index != "" && index.indexOf("excel") != -1) {
+        $("#excelBtn").show();
+        $("#toolbar").show();
+    } else {
+        $("#excelBtn").hide();
+        $(".columns-right").hide();
+    }
+    if (index != null && index != "" && index.indexOf("upload") != -1) {
+        $("#uploadBtn").show();
+    } else {
+        $("#uploadBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("pdf") != -1) {
+        $("#pdfBtn").show();
+    } else {
+        $("#pdfBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("pdf2") != -1) {
+        $("#pdfBtn2").show();
+    } else {
+        $("#pdfBtn2").hide();
+    }
+    if (index != null && index != "" && index.indexOf("cancelAll") != -1) {
+        $("#updateStateBtn").show();
+    } else {
+        $("#updateStateBtn").hide();
+    }
+    if (index != null && index != "" && index.indexOf("useAll") != -1) {
+        $("#updateStateBtn2").show();
+    } else {
+        $("#updateStateBtn2").hide();
+    }
+});
+
+function initTable() {
+    if (tipLoad == 1) {
+        $("#table").bootstrapTable({ // 对应table标签的id
+            //method: 'POST',
+            url: path+"/unfile/unfileList", // 获取表格数据的url
+            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+            //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
+            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+            striped: true,  //是否显示行间隔色
+            pagination: true, // 在表格底部显示分页组件，默认false
+            paginationShowPageGo: true,
+            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+            sidePagination: 'server', // 设置为服务器端分页     客户端：client
+            search: false,
+            showColumns: true,
+            toolbar: '#toolbar',//指定工具栏
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '---', //当数据为 undefined 时显示的字符
+            singleSelect: false,//设置True 将禁止多选
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            //height: getHeight(260),     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            //是否显示导出按钮
+            showExport: true,
+            //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+            exportDataType: "basic",
+            //导出文件类型
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+            exportOptions: {
+                fileName: document.title
+            },
+            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 deptName = $("#deptName").val();
+                if (deptName.indexOf("") != -1) {
+                    deptName = "";
+                } else {
+                    deptName = $("#deptName").val().toString();
+                }
+
+                var deptAdmissionTo = $("#deptAdmissionTo").val();
+                if (deptAdmissionTo.indexOf("") != -1) {
+                    deptAdmissionTo = "";
+                } else {
+                    deptAdmissionTo = $("#deptAdmissionTo").val().toString();
+                }
+
+                var temp = {
+                    limit: limit,     //页面大小
+                    offset: offset,   //页码
+                    inpNo: "" + $("#inpNo").val(),
+                    visitId: "" + $("#visitId").val(),
+                    name: "" + $("#name").val(),
+                    deptName: deptName.toString(),
+                    deptAdmissionTo: deptAdmissionTo.toString(),
+                    archivestate: "" + $("#archivestate").val(),
+                    startDateTo: $("#startDateTo").val(),
+                    endDateTo: $("#endDateTo").val(),
+                    startDate: $("#startDate").val(),
+                    endDate: $("#endDate").val(),
+                    doctorInCharge: $("#doctorInCharge").val(),
+                    isSearch: $("#isSearch").val()
+                };
+                return temp;
+            },
+            sortName: 'id', // 要排序的字段
+            sortOrder: 'desc', // 排序规则
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'center',
+                valign: 'middle',
+            },
+                {
+                    title: '住院号',
+                    field: 'inpNo',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '住院次数',
+                    field: 'visitId',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '姓名',
+                    field: 'name',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '性别',
+                    field: 'sex',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '入院科室',
+                    field: 'deptAdmissionTo',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '入院日期',
+                    field: 'admissionDateTime',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return operDisDate(value);
+                    }
+                },
+                {
+                    title: '出院科室',
+                    field: 'deptName',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '出院日期',
+                    field: 'dischargeDateTime',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return operDisDate(value);
+                    }
+                },
+                {
+                    title: '主管医生',
+                    field: 'doctorInCharge',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '状态',
+                    field: 'status',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: paramsMatter,
+                },
+                {
+                    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("select") != -1) {
+                            html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';
+                        }
+                        if (index != null && index != "" && index.indexOf("showFlow") != -1) {
+                            html += '<button type="button" class="btn btn-sm btn-success showFlowInfo">查看流程</button>'
+                        }
+                        return html;
+                    }, events: {
+                        'click .selInfo': function (e, value, row, index) {
+                            //查询是否医生或护士是否提交
+                            //selectHis(row);
+                            $('#selModal').modal({
+                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                                show: true//弹出对话框
+                            });
+                            if (row.archivestate != '复审退回') {
+                                $("#recallDiv").hide();
+                            } else {
+                                $("#recallDiv").show();
+                            }
+                            if (row.archivestate == '初审') {
+                                $("#firstDiv").show();
+                            } else {
+                                $("#firstDiv").hide();
+                            }
+                            //删除缓存
+                            //删除病历清单分段树选中
+                            $("#assortId").html(0);
+                            //删除病历清单查看单个pdf复选框选中信息
+                            idArr = [];
+                            //同步
+                            $("#idLab").html(row.id);
+                            $("#nameLab").html(row.name);
+                            $("#inDateLab").html(operDisTime(row.admissionDateTime));
+                            $("#chargeLab").html(row.doctorInCharge);
+                            $("#deptToLab").html(row.deptAdmissionTo);
+                            //出院
+                            if (row.dischargeDateTime != null && row.dischargeDateTime != '') {
+                                $("#inDateLab1").html(operDisTime(row.dischargeDateTime));
+                            }
+                            $("#deptToLab1").html(row.deptName);
+
+                            $("#outHospLab").html(row.dischargeDisposition);
+                            $("#inLab").html(row.inpNo);
+                            $("#inTimeLab").html(row.visitId);
+                            $("#wzContent").html(row.lockinfo);
+                            //入/出院年+出院月+住院号+住院次数
+                            var outDate = "";
+                            if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
+                                outDate = row.dischargeDateTime.split("-");
+                            } else if (row.admissionDateTime != null && row.admissionDateTime == "") {
+                                outDate = row.admissionDateTime.split("-");
+                            }
+                            $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
+
+                            initTree(row.id, $("#checker").val());
+                        },
+                        //查看流程
+                        'click .showFlowInfo': function (e, value, row) {
+                            $('#showFlowInfo').modal({
+                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                                show: true//弹出对话框
+                            });
+                            var masterId = row.id;
+                            var name = row.name;
+                            var inpNo = row.inpNo;
+                            var visitId = row.visitId;
+                            var dischargeDateTime = row.dischargeDateTime;
+                            $("#showFlowInfoIframe").prop("src", path + "/beHosp/toShowFlowInfo?id=" + masterId + "&name=" + name + "&inpNo=" + inpNo + "&visitId=" + visitId + "&dischargeDateTime=" + dischargeDateTime + "&role=" + $("#checker").val());
+                        }
+                    },
+                    cellStyle: function (value, row, index) {
+                        return {classes: 'success'}
+
+                    }
+                }
+            ],
+            onLoadSuccess: function (result) {  //加载成功时执行
+                // console.info("加载成功");
+                $(".page-list").show();
+                tipLoad = 0;
+                reloadTableHeight("table");
+            },
+            onLoadError: function () {  //加载失败时执行
+                //console.info("加载数据失败");
+                tipLoad = 0;
+            }
+        });
+    }
+}
+
+function paramsMatter(value, row) {
+    var result = '';
+    if (value == '在院') {
+        return '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>在院</span>';
+    } else {
+        if (row.days > 0) {
+            result = '<span style="color:red">(超期)</span></span>';
+        }
+        value = '<p class="hidden-xs" title="' + value + '">' + result + value + '</p>';
+    }
+    return value;
+}
+
+//导出excel功能
+$("#excelBtn").click(function () {
+    var doctorInCharge = $("#doctorInCharge").val();
+    var inpNo = $("#inpNo").val();
+    var visitId = $("#visitId").val();
+    var name = $("#name").val();
+    var deptName = $("#deptName").val();
+    if (deptName.indexOf("") != -1) {
+        deptName = "";
+    } else {
+        deptName = $("#deptName").val().toString();
+    }
+    var deptAdmissionTo = $("#deptAdmissionTo").val();
+    if (deptAdmissionTo.indexOf("") != -1) {
+        deptAdmissionTo = "";
+    } else {
+        deptAdmissionTo = $("#deptAdmissionTo").val().toString();
+    }
+    var archivestate = $("#archivestate").val();
+    var startDateTo = $("#startDateTo").val();
+    var endDateTo = $("#endDateTo").val();
+    var startDate = $("#startDate").val();
+    var endDate = $("#endDate").val();
+    var isSearch = $("#isSearch").val();
+    var url = path+"/unfile/exportExcel";
+    post(url, {
+        "doctorInCharge": doctorInCharge,
+        "inpNo": inpNo,
+        "visitId": visitId,
+        "name": name,
+        "deptAdmissionTo": deptAdmissionTo,
+        "startDate": startDate,
+        "endDate": endDate,
+        "deptName": deptName,
+        "startDateTo": startDateTo,
+        "endDateTo": endDateTo,
+        "isSearch": isSearch,
+        "archivestate": archivestate
+    })
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js
new file mode 100644
index 0000000..42128b2
--- /dev/null
+++ b/src/main/webapp/static/js/vCount/vCountList.js
@@ -0,0 +1,843 @@
+var tipLoad = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
+$(function () {
+    getDept();
+    //日期控件
+    initDateInput('startDate', 'endDate');
+    var url = window.location.href;
+    var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    if (index != null && index != "" && index.indexOf("excel") != -1) {
+        $("#excelBtn").show();
+        $("#toolbar").show();
+    } else {
+        $("#excelBtn").hide();
+        $(".columns-right").hide();
+    }
+    if (index != null && index != "" && index.indexOf("excel2") != -1) {
+        $("#excelBtn2").show();
+    } else {
+        $("#excelBtn2").hide();
+    }
+    var myChartOne = echarts.init(document.getElementById('chartmainOne'));
+    var myChartTwo = echarts.init(document.getElementById('chartmainTwo'));
+    // var myChartThree = echarts.init(document.getElementById('chartmainThree'));
+    // var myChartFour = echarts.init(document.getElementById('chartmainFour'));
+    var deptArr = ['科室1', '科室3', '科室4', '科室5', '科室6', '科室7', '科室8', '科室9'];
+    var outArr = [400, 400, 300, 300, 300, 400, 400, 400, 300];
+    var fileArr = [400, 500, 500, 500, 500, 400, 400, 500, 500];
+    var unFileArr = [400, 600, 700, 700, 1000, 400, 400, 600, 700];
+    var deathArr = [400, 500, 500, 500, 500, 400, 400, 500, 500];
+    var arr = [80, 34, 39, 35, 38, 36, 34, 36, 34];
+    var day2Arr = [25, 22, 26, 28, 27, 26, 23, 36, 34];
+    var day3Arr = [15, 12, 16, 18, 17, 16, 13, 36, 34];
+    var day7Arr = [10, 10, 10, 18, 17, 10, 63, 36, 34];
+    //获取部门统计列表
+    var entity = {};
+    entity.deptCode = $("#deptName").val();
+    entity.startDate = $("#startDate").val();
+    entity.endDate = $("#endDate").val();
+    $.ajax({
+        url: path+"/vCount/vCountNumList",
+        type: "POST",
+        data: entity,
+        success: function (result) {
+            var optionOne;
+            var optionTwo;
+            if (result != null) {
+                deptArr = [];
+                outArr = [];
+                fileArr = [];
+                unFileArr = [];
+                deathArr = [];
+                arr = [];
+                day2Arr = [];
+                day3Arr = [];
+                day7Arr = [];
+                for (var i = 0; i < result.length; i++) {
+                    if (result[i].deptName != null && result[i].deptName != '') {
+                        //科室
+                        deptArr.push(result[i].deptName);
+                        //出院数
+                        outArr.push(result[i].outNum);
+                        //归档数
+                        fileArr.push(result[i].fileNum);
+                        //未归档数
+                        unFileArr.push(result[i].unfileNum);
+                        //死亡数
+                        deathArr.push(result[i].deathNum);
+                        //归档率
+                        arr.push(Math.round(result[i].fileRate * 100));
+                        //2日归档率
+                        day2Arr.push(Math.round(result[i].day2Rate * 100));
+                        //3日归档率
+                        day3Arr.push(Math.round(result[i].day3Rate * 100));
+                        //7日归档率
+                        day7Arr.push(Math.round(result[i].day7Rate * 100));
+                    }
+                }
+                optionOne = {
+                    backgroundColor: '#ECF0F5',
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+                        }
+                    },
+                    toolbox: {
+                        //show: true,
+                        feature: {
+                            //mark: {show: true},
+                            //dataView : {show: true, readOnly: false},
+                            magicType: {show: true, type: ['line', 'bar']},
+                            restore: {show: true},
+                            saveAsImage: {show: true}
+                        }
+                    },
+                    grid: {
+                        left: '2%',
+                        right: '4%',
+                        bottom: '14%',
+                        top: '16%',
+                        containLabel: true
+                    },
+                    legend: {
+                        data: ['出院人数', '已归档', '未归档', '死亡人数'],
+                        //right: 10,
+                        top: 12,
+                        textStyle: {
+                            color: "#323a5e"
+                        },
+                        itemWidth: 12,
+                        itemHeight: 10,
+                        // itemGap: 35
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: deptArr,
+                        axisLine: {
+                            lineStyle: {
+                                color: '323a5e'
+
+                            }
+                        },
+                        axisLabel: {
+                            // interval: 0,
+                            // rotate: 40,
+                            textStyle: {
+                                fontFamily: 'Microsoft YaHei'
+                            }
+                        },
+                    },
+
+                    yAxis: {
+                        type: 'value',
+                        axisLine: {
+                            show: false,
+                            lineStyle: {
+                                color: '#90979c'
+                            }
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: '#ccc'
+                            }
+                        },
+                        axisLabel: {}
+                    },
+                    "dataZoom": [{
+                        "show": true,
+                        "height": 12,
+                        "xAxisIndex": [
+                            0
+                        ],
+                        bottom: '8%',
+                        "start": 10,
+                        "end": 90,
+                        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+                        handleSize: '110%',
+                        handleStyle: {
+                            color: "#d3dee5",
+
+                        },
+                        textStyle: {
+                            color: "#90979c"
+                        },
+                        borderColor: "#90979c"
+                    }, {
+                        "type": "inside",
+                        "show": true,
+                        "height": 15,
+                        "start": 1,
+                        "end": 35
+                    }],
+                    series: [{
+                        name: '出院人数',
+                        type: 'bar',
+                        barWidth: '15%',
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#fccb05'
+                                }, {
+                                    offset: 1,
+                                    color: '#f5804d'
+                                }]),
+                                barBorderRadius: 12,
+                            },
+                        },
+                        data: outArr
+                    },
+                        {
+                            name: '已归档',
+                            type: 'bar',
+                            barWidth: '15%',
+                            itemStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                        offset: 0,
+                                        color: '#8bd46e'
+                                    }, {
+                                        offset: 1,
+                                        color: '#09bcb7'
+                                    }]),
+                                    barBorderRadius: 11,
+                                }
+
+                            },
+                            data: fileArr
+                        },
+                        {
+                            name: '未归档',
+                            type: 'bar',
+                            barWidth: '15%',
+                            itemStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                        offset: 0,
+                                        color: '#248ff7'
+                                    }, {
+                                        offset: 1,
+                                        color: '#6851f1'
+                                    }]),
+                                    barBorderRadius: 11,
+                                }
+                            },
+                            data: unFileArr
+                        }, {
+                            name: '死亡人数',
+                            type: 'bar',
+                            barWidth: '15%',
+                            itemStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                        offset: 0,
+                                        color: '#DBDB70'
+                                    }, {
+                                        offset: 1,
+                                        color: '#EAEAAE'
+                                    }]),
+                                    barBorderRadius: 11,
+                                }
+
+                            },
+                            data: deathArr
+                        },]
+                };
+
+                var app = {
+                    currentIndex: -1,
+                };
+                setInterval(function () {
+                    var dataLen = optionOne.series[0].data.length;
+
+                    // 取消之前高亮的图形
+                    myChartOne.dispatchAction({
+                        type: 'downplay',
+                        seriesIndex: 0,
+                        dataIndex: app.currentIndex
+                    });
+                    app.currentIndex = (app.currentIndex + 1) % dataLen;
+                    //console.log(app.currentIndex);
+                    // 高亮当前图形
+                    myChartOne.dispatchAction({
+                        type: 'highlight',
+                        seriesIndex: 0,
+                        dataIndex: app.currentIndex,
+                    });
+                    // 显示 tooltip
+                    myChartOne.dispatchAction({
+                        type: 'showTip',
+                        seriesIndex: 0,
+                        dataIndex: app.currentIndex
+                    });
+
+
+                }, 1000);
+                optionTwo = {
+                    backgroundColor: '#ECF0F5',
+                    title: {
+                        text: '归档率变化',
+                        textStyle: {
+                            color: "#ccc"
+                        }
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['归档率%', '2日归档率%', '3日归档率%', '7日归档率%'],
+                        textStyle: {
+                            color: "#000"
+                        }
+                    },
+                    grid: {
+                        top: 'middle',
+                        left: '3%',
+                        right: '4%',
+                        bottom: '3%',
+                        height: '80%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        show: true,
+                        feature: {
+                            mark: {show: true},
+                            //dataView: {show: true, readOnly: false},
+                            magicType: {show: true, type: ['line', 'bar']},
+                            restore: {show: true},
+                            saveAsImage: {show: true}
+                        }
+                    },
+                    calculable: true,
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: deptArr,
+                            axisTick: {
+                                show: true //隐藏X轴刻度
+                            },
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: "#000" //X轴文字颜色
+                                }
+                            },
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value',
+                            name: "%",
+                            nameTextStyle: {
+                                color: "#000"
+                            },
+                            axisLabel: {
+                                formatter: '{value}%'
+                            },
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: "#000"
+                                }
+                            },
+                            splitLine: {
+                                lineStyle: {
+                                    type: 'dashed',
+                                    color: '#DDD'
+                                }
+                            },
+                        }
+                    ],
+                    "dataZoom": [{
+                        "show": true,
+                        "height": 12,
+                        "xAxisIndex": [
+                            0
+                        ],
+                        bottom: '8%',
+                        "start": 10,
+                        "end": 90,
+                        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+                        handleSize: '110%',
+                        handleStyle: {
+                            color: "#d3dee5",
+
+                        },
+                        textStyle: {
+                            color: "#90979c"
+                        },
+                        borderColor: "#90979c"
+                    }, {
+                        "type": "inside",
+                        "show": true,
+                        "height": 15,
+                        "start": 1,
+                        "end": 35
+                    }],
+                    series: [
+                        {
+                            name: '归档率%',
+                            type: 'line',
+                            min: 10,
+                            max: 100,
+                            data: arr,
+                            lineStyle: {
+                                normal: {
+                                    width: 5,
+                                    color: {
+                                        type: 'linear',
+
+                                        colorStops: [{
+                                            offset: 0,
+                                            color: '#9F5F9F' // 0% 处的颜色
+                                        },
+                                            {
+                                                offset: 0.4,
+                                                color: '#9F5F9F' // 100% 处的颜色
+                                            }, {
+                                                offset: 1,
+                                                color: '#9F5F9F' // 100% 处的颜色
+                                            }
+                                        ],
+                                        globalCoord: false // 缺省为 false
+                                    },
+                                    shadowColor: 'rgba(71,216,190, 0.5)',
+                                    shadowBlur: 10,
+                                    shadowOffsetY: 7
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color: '#9F5F9F',
+                                    borderWidth: 10,
+                                    borderColor: "#AAF487"
+                                }
+                            },
+                            smooth: true,
+                            markLine: {
+                                data: [
+                                    {type: 'average', name: '平均值'}
+                                ]
+                            }
+                        },
+                        {
+                            name: '2日归档率%',
+                            type: 'line',
+                            min: 10,
+                            max: 100,
+                            data: day2Arr,
+                            lineStyle: {
+                                normal: {
+                                    width: 5,
+                                    color: {
+                                        type: 'linear',
+
+                                        colorStops: [{
+                                            offset: 0,
+                                            color: '#F6D06F' // 0% 处的颜色
+                                        },
+                                            {
+                                                offset: 0.4,
+                                                color: '#F9A589' // 100% 处的颜色
+                                            }, {
+                                                offset: 1,
+                                                color: '#F9A589' // 100% 处的颜色
+                                            }
+                                        ],
+                                        globalCoord: false // 缺省为 false
+                                    },
+                                    shadowColor: 'rgba(249,165,137, 0.5)',
+                                    shadowBlur: 10,
+                                    shadowOffsetY: 7
+                                }
+                            },
+
+                            itemStyle: {
+                                normal: {
+                                    color: '#F6D06F',
+                                    borderWidth: 10,
+                                    borderColor: "#F6D06F"
+                                }
+                            },
+                            smooth: true,
+                            markLine: {
+                                data: [
+                                    {type: 'average', name: '平均值'}
+                                ]
+                            }
+                        }
+                        ,
+                        {
+                            name: '3日归档率%',
+                            type: 'line',
+                            min: 10,
+                            max: 100,
+                            data: day3Arr,
+                            lineStyle: {
+                                normal: {
+                                    width: 5,
+                                    color: {
+                                        type: 'linear',
+
+                                        colorStops: [{
+                                            offset: 0,
+                                            color: '#C6D06F' // 0% 处的颜色
+                                        },
+                                            {
+                                                offset: 0.4,
+                                                color: '#C6D06F' // 100% 处的颜色
+                                            }, {
+                                                offset: 1,
+                                                color: '#C6D06F' // 100% 处的颜色
+                                            }
+                                        ],
+                                        globalCoord: false // 缺省为 false
+                                    },
+                                    shadowColor: 'rgba(249,165,137, 0.5)',
+                                    shadowBlur: 10,
+                                    shadowOffsetY: 7
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color: '#C6D06F',
+                                    borderWidth: 10,
+                                    /*shadowColor: 'rgba(72,216,191, 0.3)',
+                                     shadowBlur: 100,*/
+                                    borderColor: "#F6D06F"
+                                }
+                            },
+                            smooth: true,
+                            markLine: {
+                                data: [
+                                    {type: 'average', name: '平均值'}
+                                ]
+                            }
+                        }
+                        ,
+                        {
+                            name: '7日归档率%',
+                            type: 'line',
+                            min: 10,
+                            max: 100,
+                            data: day7Arr,
+                            lineStyle: {
+                                normal: {
+                                    width: 5,
+                                    color: {
+                                        type: 'linear',
+
+                                        colorStops: [{
+                                            offset: 0,
+                                            color: '#06D06F' // 0% 处的颜色
+                                        },
+                                            {
+                                                offset: 0.4,
+                                                color: '#06D06F' // 100% 处的颜色
+                                            }, {
+                                                offset: 1,
+                                                color: '#06D06F' // 100% 处的颜色
+                                            }
+                                        ],
+                                        globalCoord: false // 缺省为 false
+                                    },
+                                    shadowColor: 'rgba(249,165,137, 0.5)',
+                                    shadowBlur: 10,
+                                    shadowOffsetY: 7
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    color: '#06D06F',
+                                    borderWidth: 10,
+                                    /*shadowColor: 'rgba(72,216,191, 0.3)',
+                                     shadowBlur: 100,*/
+                                    borderColor: "#F6D06F"
+                                }
+                            },
+                            smooth: true,
+                            markLine: {
+                                data: [
+                                    {type: 'average', name: '平均值'}
+                                ]
+                            }
+                        }
+                    ]
+                };
+            }
+            //使用制定的配置项和数据显示图表
+            myChartOne.setOption(optionOne);
+            //使用制定的配置项和数据显示图表
+            myChartTwo.setOption(optionTwo);
+        }
+    });
+});
+
+function initTable() {
+    if (tipLoad == 1) {
+        $("#table").bootstrapTable({ // 对应table标签的id
+            //method: 'POST',
+            url: path+"/vCount/vCountList", // 获取表格数据的url
+            contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+            striped: true,  //表格显示条纹，默认为false
+            pagination: true, // 在表格底部显示分页组件，默认false
+            paginationShowPageGo: true,
+            pageList: [5, 10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+            sidePagination: 'server', // 设置为服务器端分页     客户端：client
+            search: false,
+            showColumns: true,
+            toolbar: '#toolbar',//指定工具栏
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '--', //当数据为 undefined 时显示的字符
+            singleSelect: false,//设置True 将禁止多选
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            //height: getHeight(197),     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            //是否显示导出按钮
+            showExport: true,
+            //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+            exportDataType: "basic",
+            //导出文件类型
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+            exportOptions: {
+                fileName: document.title
+            },
+            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 deptName = $("#deptName").val();
+                if (deptName.indexOf("") != -1) {
+                    deptName = "";
+                } else {
+                    deptName = $("#deptName").val().toString();
+                }
+                var temp = {
+                    limit: limit,     //页面大小
+                    offset: offset,   //页码
+                    //order: params.order,      //排位命令（desc，asc）
+                    deptCode: deptName.toString(),
+                    startDate: $("#startDate").val(),
+                    endDate: $("#endDate").val(),
+
+                };
+                return temp;
+            },
+            sortName: 'id', // 要排序的字段
+            sortOrder: 'desc', // 排序规则
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'center',
+                valign: 'middle',
+            },
+                {
+                    title: '序号',
+                    field: 'id',
+                    align: 'center',
+                    valign: 'middle',
+                    //sortable: true,
+                    // visible: false,
+                    formatter: function (value, row, index) {
+                        return index + 1;
+                    }
+                },
+                {
+                    title: '科室代码',
+                    field: 'deptCode',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                {
+                    title: '科室名称',
+                    field: 'deptName',
+                    align: 'left',
+                    valign: 'middle',
+                },
+                // {
+                //     title: '在院人数',
+                //     field: 'inNum',
+                //     align: 'center',
+                //     valign: 'middle',
+                // },
+                {
+                    title: '出院人数',
+                    field: 'outNum',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '已归档',
+                    field: 'fileNum',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '未归档',
+                    field: 'unfileNum',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '死亡人数',
+                    field: 'deathNum',
+                    align: 'center',
+                    valign: 'middle',
+                },
+                {
+                    title: '归档率%',
+                    field: 'fileRate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        var val;
+                        if (row.fileRate != null && row.fileRate != '') {
+                            val = Math.round(row.fileRate * 100) + "%";
+                        }
+                        return val;
+                    }
+                },
+                {
+                    title: '2日归档率%',
+                    field: 'day2Rate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        var val;
+                        if (row.day2Rate != null && row.day2Rate != '') {
+                            val = Math.round(row.day2Rate * 100) + "%";
+                        }
+                        return val;
+                    }
+                },
+                {
+                    title: '3日归档率%',
+                    field: 'day3Rate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        var val;
+                        if (row.day3Rate != null && row.day3Rate != '') {
+                            val = Math.round(row.day3Rate * 100) + "%";
+                        }
+                        return val;
+                    }
+                },
+                {
+                    title: '7日归档率%',
+                    field: 'day7Rate',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        var val;
+                        if (row.day7Rate != null && row.day7Rate != '') {
+                            val = Math.round(row.day7Rate * 100) + "%";
+                        }
+                        return val;
+                    }
+                }
+            ],
+            onLoadSuccess: function (result) {  //加载成功时执行
+                $(".page-list").show();
+                tipLoad = 0;
+                reloadTableHeight("table");
+            },
+            onLoadError: function () {  //加载失败时执行
+                tipLoad = 0;
+            }
+        });
+    }
+}
+
+//查询
+$('#searchBtn').click(function () {
+    //查询之后重新从第一页算起
+    if (tipLoad == 0) {
+        $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
+    } else {
+        toastr.warning("正在查询，请稍等...");
+    }
+});
+
+initTable();
+
+//2.初始化select的change事件
+$("#sel_exportoption").change(function () {
+    $('#table').bootstrapTable('refreshOptions', {
+        exportDataType: $(this).val()
+    });
+});
+$("#refreshBtn").click(function () {
+    //刷新
+    $('#table').bootstrapTable('refresh');
+});
+
+//导出excel功能
+$("#excelBtn").click(function () {
+    //获取选中数据记录
+    var idlist = $('#table').bootstrapTable('getAllSelections');
+    var sql = '';//AND (deptName = '222' or deptName = '333')
+    if (idlist.length > 0) {
+        for (var i = 0; i < idlist.length; i++) {
+            if (idlist.length == 1) {
+                sql += "AND (deptName = '" + idlist[i].deptName + "')";
+            } else {
+                if (i == 0) {
+                    sql += "AND (deptName = '" + idlist[i].deptName + "') or ";
+                } else if (i != idlist.length - 1) {
+                    sql += "(deptName = '" + idlist[i].deptName + "') or ";
+                } else if (i == idlist.length - 1) {
+                    sql += "(deptName = '" + idlist[i].deptName + "')";
+                }
+            }
+        }
+    }
+    var deptName = $("#deptName").val();
+    if (deptName.indexOf("") != -1) {
+        deptName = "";
+    } else {
+        deptName = $("#deptName").val().toString();
+    }
+    var startDate = $("#startDate").val();
+    var endDate = $("#endDate").val();
+    window.location.href = path+"/vCount/exportExcel?deptCode=" + deptName + "&startDate=" + startDate
+        + "&endDate=" + endDate + "&sql=" + sql;
+});
+//导出excel功能
+$("#excelBtn2").click(function () {
+    //var deptName = "" + $("#deptName").val();
+    var deptName = $("#deptName").val();
+    if (deptName.indexOf("") != -1) {
+        deptName = "";
+    } else {
+        deptName = $("#deptName").val().toString();
+    }
+    var startDateTo = $("#startDate").val();
+    var endDateTo = $("#endDate").val();
+
+    window.location.href = path+"/vCount/exportExcel2?deptName=" + deptName + "&startDateTo=" + startDateTo
+        + "&endDateTo=" + endDateTo;
+});
\ No newline at end of file