diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
index 60d0f59..642baee 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp
@@ -138,7 +138,7 @@
             </div>
             <div class="searchInput left">
                 <div class="searchElement left">
-                    <label class="labelDiv">姓名：</label>
+                    <label class="labelDiv">产妇姓名：</label>
                 </div>
                 <div class="searchInputElement left">
                     <input type="test" class="form-control input-sm" id="searchName" maxlength="16">
@@ -181,6 +181,9 @@
             </div>
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
+                <shiro:hasPermission name="/approve/updateApprove">
+                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning btnl" onclick="addApprovesMore()">  +  批量审批</button>
+                </shiro:hasPermission>
                 <shiro:hasPermission name="/approve/exportExcelApproveList">
                     <button type="button" class="btn btn-sm btn-primary btns" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
                 </shiro:hasPermission>
@@ -221,7 +224,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" readonly id="effeTime">
+                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -230,7 +233,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" readonly id="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -272,7 +275,7 @@
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
-                    </div>
+                    </div>+
                     <div class="row">
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">脐血编号：</label>
@@ -300,12 +303,71 @@
         </div>
     </div>
 </div>
+<%-- 模态框2 批量审批--%>
+<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabe2" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content" style="width:80%">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    批量审批信息
+                </h4>
+            </div>
+            <div class="modal-body" style="height:700px">
+                <form class="form-horizontal" id="form2">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">批注模板：</label>
+                            <div class="col-sm-7">
+                                <select class="form-control input-sm input" id="moreParentId" name="parentId">
+                                </select>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">批注：</label>
+                            <div class="col-sm-7">
+                                <textarea class="form-control input-sm input" id="moreApproveNotes" name="approveNotes" maxlength="250"></textarea>
+                            </div>
+                            <div class="col-sm-1"></div>
+                        </div>
+                    </div>
+                    <div class="">
+                        <button type="button" class="btn btn-sm btn-primary approveBtns" onclick="moreAdd(1)">批准</button>
+                        <button type="button" class="btn btn-sm btn-danger approveBtns" onclick="moreAdd(2)">驳回</button>
+                    </div>
+                </form>
+                <div id="tabDiv" style="height: 490px;overflow: auto;">
+                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0" cellpadding="0">
+                        <caption>所选批量审批信息</caption>
+                        <thead>
+                        <tr>
+                            <th>病案号</th>
+                            <th>姓名</th>
+                            <th>入院次数</th>
+                            <th>申请人</th>
+                        </tr>
+                        </thead>
+                        <tbody id="moreApproveBody">
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
     $(function () {
         $(".modal-dialog").draggable();//为模态对话框添加拖拽
     })
 </script>
 <script src="${path}/static/js/approveManage/approveManageList/approveManageList1.js?t=1"></script>
+<script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 <script src="${path}/static/js/commom.js"></script>
 <script src="${path}/static/js/dateUtil.js"></script>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp
index 00aef69..855bae6 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage.jsp
@@ -483,7 +483,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp
index 91c42ce..c4c45cb 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp
@@ -466,7 +466,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
index a071502..4377afd 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
@@ -494,7 +494,6 @@
 <script>
     $(function(){
         $("td").click(function(event){
-            debugger
             //td中已经有了input,则不需要响应点击事件
             if($(this).children("input").length > 0)
                 return false;
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
index e656f39..7c9f2bb 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp
@@ -65,7 +65,7 @@
         <div class="col-sm-3">
             <button type="button" class="btn btn-sm btn-primary" onclick="onloadPdf()">加载PDF</button>
         </div>
-        <c:if test="${CURRENT_USER.userEmail == 1 || isDownload == 1}">
+        <c:if test="${CURRENT_USER.userEmail == '1' || isDownload == '1'}">
             <div class="col-sm-3">
                 <button type="button" class="btn btn-sm btn-primary" onclick="onloadJpgForPdf()">下载PDF</button>
             </div>
diff --git a/src/main/webapp/static/js/approveManage/approveList/approveList1.js b/src/main/webapp/static/js/approveManage/approveList/approveList1.js
index 34a2cf5..d154183 100644
--- a/src/main/webapp/static/js/approveManage/approveList/approveList1.js
+++ b/src/main/webapp/static/js/approveManage/approveList/approveList1.js
@@ -249,7 +249,7 @@ function refreshTable(){
 
 //添加按钮
 function addApprove(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -262,7 +262,7 @@ function addApprove(){
 
 //批量添加按钮
 function addApproves(){
-    pickTime("effeTime5");
+    pickTime("effeTime5", null);
     form5.reset();
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId5','');
diff --git a/src/main/webapp/static/js/approveManage/approveList/approveList174.js b/src/main/webapp/static/js/approveManage/approveList/approveList174.js
index 9eb6dfc..47277e9 100644
--- a/src/main/webapp/static/js/approveManage/approveList/approveList174.js
+++ b/src/main/webapp/static/js/approveManage/approveList/approveList174.js
@@ -248,7 +248,7 @@ function refreshTable(){
 
 //批量添加按钮
 function addApproves(){
-    pickTime("effeTime5");
+    pickTime("effeTime5", null);
     form5.reset();
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId5','');
@@ -256,7 +256,7 @@ function addApproves(){
 
 //添加按钮
 function addApprove(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -335,7 +335,7 @@ function addSimple(){
 }
 //编辑
 function updateApprove(id){
-    pickTime("effeTime")
+    pickTime("effeTime", null);
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId','');
     $("#inpatientNo").prop("readonly",true);
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList1.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList1.js
index 4086940..75f3667 100644
--- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList1.js
+++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList1.js
@@ -68,7 +68,7 @@ $('#mytab').bootstrapTable({
             field:'effeDays',
         },
         {
-            title:'姓名',
+            title:'产妇姓名',
             field:'name',
         },
         {
@@ -248,6 +248,7 @@ function updateApprove(id){
                 $("#approveId").val(data.id);
                 $("#applyer").val(data.applyer);
                 $("#effeTime").val(data.effeTime);
+                pickTime("effeTime", data.effeTime);
                 $("#effeDays").val(data.effeDays);
                 $("#applyType").val(data.applyType);
                 $("#parentId").val(data.annoParentId);
@@ -315,4 +316,118 @@ function exportExcel(){
 $(function () {
 	initDateInput(1);
 	initDateInput(2);
-})
\ No newline at end of file
+})
+
+/**
+ * 批量审批
+ */
+function addApprovesMore() {
+    debugger
+    clearContent();
+    tabChecks = getChecked();
+    if (tabChecks.length > 0){
+        //加载批注类别
+        loadSelect(path+ '/approve/loadAnnoModle','moreParentId','');
+        $('#addApprovesMore').attr("data-toggle", "modal");
+        $('#addApprovesMore').attr("data-target", "#myModal2");
+        $("#form2")[0].reset();
+    } else {
+        toastr.warning("至少选中一条!");
+    }
+
+}
+
+/**
+ * 添加内容，tr td
+ * @param inpatientNoArray
+ * @param admissTimesArray
+ * @param nameArray
+ * @param applyerArray
+ */
+function insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArray) {
+    for (var i = 0 ; i < inpatientNoArray.length; i++){
+        var tr = document.createElement("tr");
+        var td1 = document.createElement("td");
+        var td2 = document.createElement("td");
+        var td3 = document.createElement("td");
+        var td4 = document.createElement("td");
+        td1.innerHTML = inpatientNoArray[i];
+        td2.innerHTML = nameArray[i];
+        td3.innerHTML = admissTimesArray[i];
+        td4.innerHTML = applyerArray[i];
+        tr.appendChild(td1);
+        tr.appendChild(td2);
+        tr.appendChild(td3);
+        tr.appendChild(td4);
+        document.getElementById("moreApproveBody").appendChild(tr);
+    }
+}
+
+/**
+ * 清楚内容方法
+ */
+function clearContent() {
+    $('#addApprovesMore').removeAttr("data-toggle", "modal");
+    $('#addApprovesMore').removeAttr("data-target", "#myModal2");
+    var table = document.getElementById("moreApproveBody");
+    var len = table.childNodes.length;
+    for (var i = len - 1; i >= 0; i--) {
+        table.removeChild(table.childNodes[i]);
+    }
+}
+
+/**
+ * 获取选中行
+ * @returns {string}
+ */
+function getChecked(){
+    tabChecks = "";
+    var inpatientNoArray = new Array();
+    var admissTimesArray = new Array();
+    var nameArray = new Array();
+    var applyerArray = new Array();
+    var idlist = $('#mytab').bootstrapTable('getAllSelections');
+    if(idlist.length > 0){
+        for (var i = 0; i < idlist.length; i++) {
+            tabChecks += idlist[i].id + ",";
+            inpatientNoArray.push(idlist[i].inpatientNo);
+            admissTimesArray.push(idlist[i].admissTimes);
+            nameArray.push(idlist[i].name);
+            applyerArray.push(idlist[i].applyer);
+        }
+        $("#checks").val(checks);
+    }
+    insertContent(inpatientNoArray, admissTimesArray, nameArray, applyerArray);
+    if (null != tabChecks){
+        tabChecks = tabChecks.substring(0,tabChecks.length-1);
+    }
+    return tabChecks;
+}
+
+/**
+ * 批量审核
+ * @param flag
+ */
+function moreAdd(flag){
+    var approve = $("#moreApproveNotes").val();
+    $.ajax({
+        type:'post',
+        url:path+'/approve/updateApproves',
+        data:{ids:tabChecks,state:flag,note:approve},
+        dataType:'json',
+        success:function(data){
+            if(data!=null && data.code == 0){
+                if(flag == 1){
+                    toastr.success("批准成功!");
+                }else{
+                    toastr.success("驳回成功!");
+                }
+                refreshTable();
+                $('#myModal2').modal('hide');
+                $('#mytab').bootstrapTable('selectPage', pageNumber);
+            }else{
+                toastr.warning(data.msg);
+            }
+        }
+    })
+}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/dateUtil.js b/src/main/webapp/static/js/dateUtil.js
index 7dc141f..e4ebed1 100644
--- a/src/main/webapp/static/js/dateUtil.js
+++ b/src/main/webapp/static/js/dateUtil.js
@@ -4,6 +4,11 @@ $('.date').datepicker({
     format: "yyyy-mm-dd",
     autoclose: true//选中之后自动隐藏日期选择框
 })
+
+/**
+ * 日期选择器
+ * @param idVal
+ */
 function initDateInput(idVal){
     $('#startTime'+idVal).datepicker({
         language: "zh-CN",
@@ -39,7 +44,12 @@ function daysBetween(sDate1,sDate2){
     var nDays = Math.abs(parseInt((time2 - time1)/1000/3600/24));
     return  nDays;
 };
-//计算前几天后几天的日期，负数为前，正数为后
+
+/**
+ * 计算前几天后几天的日期，负数为前，正数为后
+ * @param days
+ * @returns {string}
+ */
 function showTime(days){
     var endDate = new Date();
     endDate.setTime(endDate.getTime()+days*24*60*60*1000);
@@ -56,7 +66,11 @@ function showTime(days){
     return eDate;
 }
 
-function pickTime(info){
+/**
+ * 设置默认日期天数和最大可选天数
+ * @param info
+ */
+function pickTime(info, showDate){
     var defaultDay = new Date();
     var maxDay = new Date();
     $.ajax({
@@ -65,14 +79,18 @@ function pickTime(info){
         dataType:'json',
         success:function(data){
             if(data != null || data != ''){
-                defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
-                maxDay.setDate(maxDay.getDate() + data.maxDay);
                 $('#'+info).datepicker({
                     language: "zh-CN",
                     format: "yyyy-mm-dd",
                     autoclose: true,//选中之后自动隐藏日期选择框,
                 })
-                $('#'+info).datepicker('setDate', defaultDay);
+                if (null == showDate) {
+                    defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
+                    $('#'+info).datepicker('setDate', defaultDay);
+                } else {
+                    $('#'+info).datepicker('setDate', new Date(Date.parse(showDate.replace(/-/g,"/"))));
+                }
+                maxDay.setDate(maxDay.getDate() + data.maxDay);
                 $('#'+info).datepicker('setEndDate', maxDay);
             }
         }
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
index c54dfba..219a756 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordBlood.js
@@ -1055,6 +1055,7 @@ function save(){
             }
             formData.append('patientId',$("#patientId").val());
             formData.append('assortId', assortId);
+			formData.append('flag', $("#flag").val());
             $.ajax({
                 url:path+'/commom/updatePic',
                 data:formData,
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
index 1d18d64..390f517 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
@@ -1,1068 +1,1110 @@
 /***********************************************表格操作*****************************************************************/
 //TODO 添加需要格式化日期格式的字段
 var dateFields = 'disDate,admissDate,birthday,affirmDate';
-var pageNumber,showRecord,downloadRecord;
+var pageNumber, showRecord, downloadRecord;
 
-$(function(){
-	//根据窗口调整表格高度
-	/*$(window).resize(function() {
-		$('#mytab').bootstrapTable('resetView', {
-			height: tableHeight()
-		})
-	})*/
-	//加载通过审批且未过期的patientId集合
-	getApproves(1);
-	//加载通过审批且可下载的patientId集合
-	getApproves(3);
-	//查询已锁定的集合
-	getLocks();
-	//可预览信息
-	showRecord = $("#showRecord").val();
-	//可下载信息
-	downloadRecord = $("#downloadRecord").val();
+$(function () {
+    //根据窗口调整表格高度
+    /*$(window).resize(function() {
+        $('#mytab').bootstrapTable('resetView', {
+            height: tableHeight()
+        })
+    })*/
+    //加载通过审批且未过期的patientId集合
+    getApproves(1);
+    //加载通过审批且可下载的patientId集合
+    getApproves(3);
+    //查询已锁定的集合
+    getLocks();
+    //可预览信息
+    showRecord = $("#showRecord").val();
+    //可下载信息
+    downloadRecord = $("#downloadRecord").val();
 })
+
 //加载通过审批且未过期的patientId集合:type：1借阅申请，type:2下载申请
-function getApproves(type){
-	$.ajax({
-		type:'get',
-		url:path+'/template/getApproves',
-		data:{type:type},
-		dataType:'json',
-		success:function (data) {
-			if(null != data && data != ''){
-				if(type == 1){
-					$("#approves").val(data);
-				}else{
-					$("#loads").val(data);
-				}
-			}
-		}
-	})
+function getApproves(type) {
+    $.ajax({
+        type: 'get',
+        url: path + '/template/getApproves',
+        data: {type: type},
+        dataType: 'json',
+        success: function (data) {
+            if (null != data && data != '') {
+                if (type == 1) {
+                    $("#approves").val(data);
+                } else {
+                    $("#loads").val(data);
+                }
+            }
+        }
+    })
 }
+
 //查询已锁定的集合
-function getLocks(){
-	$.ajax({
-		type:'get',
-		url:path+'/template/getLocks',
-		dataType:'json',
-		success:function (data) {
-			if(null != data && data != ''){
-				$("#locks").val(data);
-			}
-		}
-	})
+function getLocks() {
+    $.ajax({
+        type: 'get',
+        url: path + '/template/getLocks',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data && data != '') {
+                $("#locks").val(data);
+            }
+        }
+    })
 }
+
 //获取选中行
-function getChecked(){
-	var idlist = getSelectedRow_st("mytab");
-	if(idlist.length > 0){
-		var checks = '';
-		for (var i = 0; i < idlist.length; i++) {
-			checks+="'"+idlist[i].patientId + "',";
-		}
-		$("#checks").val(checks);
-	}else{
-		$("#checks").val("");
-	}
+function getChecked() {
+    var idlist = getSelectedRow_st("mytab");
+    if (idlist.length > 0) {
+        var checks = '';
+        for (var i = 0; i < idlist.length; i++) {
+            checks += "'" + idlist[i].patientId + "',";
+        }
+        $("#checks").val(checks);
+    } else {
+        $("#checks").val("");
+    }
 }
+
 function tableHeight() {
-	return $(window).height() - 50;
+    return $(window).height() - 50;
 
 }
-function freshTable(){
-	$("#mytab").bootstrapTable('destroy');
-	$("#checks").val('');
-	var columns = [];
-	columns.push({
-			title:'全选',
-			field:'select',
-			checkbox:true,
-			width:25,
-			valign:'middle',
-		},
-		{
-			title:'ID',
-			field:'patientId',
-			visible:false
-		})
-	var tableThNames = $("#tableThNames").val();
-	if(tableThNames != ''){
-		var fieldCns = '';
-		var fields = $("#fields").val().split(",");
-		tableThNames = tableThNames.split(",");
-		for(var i = 0;i<tableThNames.length;i++){
-			if(tableThNames[i] != ''){
-				var map = {};
-				if(fields[i] != ''){
-					map['title'] = tableThNames[i];
-					//重新组织选项
-					//转换RH
-					if(fields[i] == 'RH'){
-						map['field'] = 'rh';
-						fields[i] = 'rh';
-					}else{
-						map['field'] = fields[i];
-					}
-					fieldCns += fields[i] + ",";
-				}
-				if(dateFields.indexOf(fields[i]) != -1){
-					map['formatter'] = function (value, row, index) {return formatTime(value,'yyyy-MM-dd')};
-				}
-				columns.push(map);
-			}
-		}
-		$("#fieldCns").val(fieldCns);
-	}
-	var map1 = {};
-	map1['title'] = '操作';
-	map1['field'] = 'Button';
-	map1['align'] = 'center';
-	map1['formatter'] = 'AddFunctionAlty';
-	columns.push(map1)
-	var sql = $("#sql").val();
-	if(sql == ''){
-		var userName = "'" + $("#userName").val() + "'";
-		sql = "select  commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id is null THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing from commomtable "
-			+"left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.apply_type != 3 and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " +userName
-			+"left join emr_apply_approve emr_apply_approve1 on commomtable.patient_id = emr_apply_approve1.patient_id and emr_apply_approve1.apply_type = 3 and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = " +userName
-			+ " left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1";
-	}
-	var orderBys = $("#orderBys").val();
-	var flag = $("#showPrint").val();
-	if(flag == 1){
-		flag = true;
-	}else{
-		flag = false;
-	}
-	//sql += orderBys;
-	//生成用户数据
-	$('#mytab').bootstrapTable({
-		method: 'post',
-		contentType:'application/x-www-form-urlencoded; charset=UTF-8',
-		toolbar: '#toolbar',                //工具按钮用哪个容器
-		striped: true,                      //是否显示行间隔色
-		cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-		pagination: true,                   //是否显示分页（*）
-		sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
-		paginationPreText : '上一页',
-		paginationNextText : '下一页',
-		detailView: flag,
-		pageNumber: 1,                       //初始化加载第一页，默认第一页
-		pageSize: 5,                       //每页的记录行数（*）
-		pageList: [5,10,20,50,100,500,1000],//可供选择的每页的行数（*）
-		height: 400,//高度调整                 //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-		buttonsAlign: "left",//按钮对齐方式
-		columns:columns,
-		locale:'zh-CN',//中文支持,
-		url:path+'/template/cutomSearchTable',//排序方式
-		queryParams: function (params) {
-			return{
-				sql:sql,
-				limit : params.limit, // 每页显示数量
-				offset : params.offset, // SQL语句起始索引
-				page : (params.offset / params.limit) + 1 //当前页码
-			}
-		},
-		responseHandler:function(res){
-			//在ajax获取到数据，渲染表格之前，修改数据源
-			var nres = [];
-			nres.push({total:res.total,rows:res.list});
-			return nres[0];
-		},
-		onLoadSuccess:function(res){
-			$(".clearfix").height(0);
-			$(".page-list").show();
-			$(".fixed-table-body").css("overflow","auto");
-			//赋值总数
-			$("#rows").val(res.total);
-			/*if(typeof($('.clearfix'))!=='undefined'){
-				var height = this.$tableBody.height() - 17;
-			}else{
-				var height = this.$tableBody.height();
-			};
-			if (!this.$body.find('> tr[data-index]').length) {
-				this.$rightFixedBody.hide();
-				return;
-			}*/
-			/*var height = tableHeight();
-			$(".fixed-table-body-columns").removeAttr("height");
-			//$(".fixed-table-body-columns").css("cssText", "height:500px!important;");
-			$(".fixed-table-body-columns").css('height',"500px!important");
-			console.log($(".fixed-table-body-columns").height());*/
-		},
-		onSort: function(name, order) {
 
-			$(".fixed-table-header-columns").find("th[data-field]").find("div.sortable").removeClass("asc desc")
-			$(".fixed-table-header-columns").find("th[data-field=" + name + "]").find("div.sortable").removeClass("asc desc").addClass(order);
-			fixleftwidth()
-		},
-		onColumnSwitch: function(field, checked) {
-			//setTimeout(function() {
-			var colnumBody = $(".fixed-table-body-columns");
-			var colnumHead = $(".fixed-table-header-columns");
-			var len = $(".fixed-table-body-columns").length;
-			for (var i = 0; i < len - 1; i++) {
-				colnumBody.eq(i).remove()
-				colnumHead.eq(i).remove()
-			}
-			fixleftwidth()
-			//}, 0)
-		},
+function freshTable() {
+    $("#mytab").bootstrapTable('destroy');
+    $("#checks").val('');
+    var columns = [];
+    columns.push({
+            title: '全选',
+            field: 'select',
+            checkbox: true,
+            width: 25,
+            valign: 'middle',
+        },
+        {
+            title: 'ID',
+            field: 'patientId',
+            visible: false
+        })
+    var tableThNames = $("#tableThNames").val();
+    if (tableThNames != '') {
+        var fieldCns = '';
+        var fields = $("#fields").val().split(",");
+        tableThNames = tableThNames.split(",");
+        for (var i = 0; i < tableThNames.length; i++) {
+            if (tableThNames[i] != '') {
+                var map = {};
+                if (fields[i] != '') {
+                    map['title'] = tableThNames[i];
+                    //重新组织选项
+                    //转换RH
+                    if (fields[i] == 'RH') {
+                        map['field'] = 'rh';
+                        fields[i] = 'rh';
+                    } else {
+                        map['field'] = fields[i];
+                    }
+                    fieldCns += fields[i] + ",";
+                }
+                if (dateFields.indexOf(fields[i]) != -1) {
+                    map['formatter'] = function (value, row, index) {
+                        return formatTime(value, 'yyyy-MM-dd')
+                    };
+                }
+                columns.push(map);
+            }
+        }
+        $("#fieldCns").val(fieldCns);
+    }
+    var map1 = {};
+    map1['title'] = '操作';
+    map1['field'] = 'Button';
+    map1['align'] = 'center';
+    map1['formatter'] = 'AddFunctionAlty';
+    columns.push(map1)
+    var sql = $("#sql").val();
+    if (sql == '') {
+        var userName = "'" + $("#userName").val() + "'";
+        sql = "select  commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id is null THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.name,commomtable.main_dis_thing from commomtable "
+            + "left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.apply_type != 3 and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " + userName
+            + "left join emr_apply_approve emr_apply_approve1 on commomtable.patient_id = emr_apply_approve1.patient_id and emr_apply_approve1.apply_type = 3 and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = " + userName
+            + " left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1";
+    }
+    var orderBys = $("#orderBys").val();
+    var flag = $("#showPrint").val();
+    if (flag == 1) {
+        flag = true;
+    } else {
+        flag = false;
+    }
+    //sql += orderBys;
+    //生成用户数据
+    $('#mytab').bootstrapTable({
+        method: 'post',
+        contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        pagination: true,                   //是否显示分页（*）
+        sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
+        paginationPreText: '上一页',
+        paginationNextText: '下一页',
+        detailView: flag,
+        pageNumber: 1,                       //初始化加载第一页，默认第一页
+        pageSize: 5,                       //每页的记录行数（*）
+        pageList: [5, 10, 20, 50, 100, 500, 1000],//可供选择的每页的行数（*）
+        height: 400,//高度调整                 //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+        buttonsAlign: "left",//按钮对齐方式
+        columns: columns,
+        locale: 'zh-CN',//中文支持,
+        url: path + '/template/cutomSearchTable',//排序方式
+        queryParams: function (params) {
+            return {
+                sql: sql,
+                limit: params.limit, // 每页显示数量
+                offset: params.offset, // SQL语句起始索引
+                page: (params.offset / params.limit) + 1 //当前页码
+            }
+        },
+        responseHandler: function (res) {
+            //在ajax获取到数据，渲染表格之前，修改数据源
+            var nres = [];
+            nres.push({total: res.total, rows: res.list});
+            return nres[0];
+        },
+        onLoadSuccess: function (res) {
+            $(".clearfix").height(0);
+            $(".page-list").show();
+            $(".fixed-table-body").css("overflow", "auto");
+            //赋值总数
+            $("#rows").val(res.total);
+            /*if(typeof($('.clearfix'))!=='undefined'){
+                var height = this.$tableBody.height() - 17;
+            }else{
+                var height = this.$tableBody.height();
+            };
+            if (!this.$body.find('> tr[data-index]').length) {
+                this.$rightFixedBody.hide();
+                return;
+            }*/
+            /*var height = tableHeight();
+            $(".fixed-table-body-columns").removeAttr("height");
+            //$(".fixed-table-body-columns").css("cssText", "height:500px!important;");
+            $(".fixed-table-body-columns").css('height',"500px!important");
+            console.log($(".fixed-table-body-columns").height());*/
+        },
+        onSort: function (name, order) {
 
-		//监听分页点击事件
-		onPageChange: function(num, type) {
-			pageNumber = num;
-		},
-		//选中单个复选框
-		onCheck:function(row){
-			var checks = $("#checks").val();
-			$("#checks").val(checks+="'"+row.patientId + "',");
-		},
-		//取消单个复选框
-		onUncheck:function(row){
-			var checks = $("#checks").val();
-			checks = checks.replace("'"+row.patientId + "',","");
-			$("#checks").val(checks);
-		},
-		//全选
-		onCheckAll:function(rows){
-			$("#checks").val("");
-			var checks = '';
-			for(var i=0;i<rows.length;i++)
-			{
-				checks += "'"+rows[i].patientId + "',"
-			}
-			$("#checks").val(checks);
-		},
-		//全不选
-		onUncheckAll: function (rows) {
-			$("#checks").val("");
-		},
-		//双击事件
-		onDblClickRow: function (row) {
-			//是否可查看
-			var isShowDetail = row.isShowDetail;
-			var lockStatus = row.lockStatus;
-			var unlockOper = row.unlockOper;
-			if(lockStatus != '' && lockStatus == 1 && unlockOper == 1){
-				toastr.warning("不可查看,已被锁定!")
-			}else {
-				if (null != isShowDetail && isShowDetail == 1 || showRecord == "1") {
-					var url = path + '/commom/showRecordBlood?patientId=' + row.patientId;
-					window.open(url);
-				} else {
-					toastr.warning("不可查看,必须申请通过!")
-				}
-			}
-		},
-		//展开详情事件
-		onExpandRow: function (index, row, $detail) {//點擊datagrid 展開按鈕事件
-			var patientId = row.patientId;
-			//查询打印简要
-			$.ajax({
-				type:'get',
-				url:path+'/printInfoList/getPrintCount',
-				dataType:'json',
-				data:{patientId:patientId},
-				success:function(data){
-					if(data.code == 0){
-						var result = data.data;
-						var str = "";
-						if(result != null && result != ''){
-							for(var i = 0;i < result.length;i++){
-								str += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-								str += "打印张数:<span style='color: red'>"+result[i].printCount+"</span>;打印时间:<span style='color: red'>"+result[i].createTime+"</span>;" +
-									"打印用途:<span style='color: red'>"+result[i].typeName+"</span>;打印者:<span style='color: red'>"+result[i].creater+"</span>";
-							}
-							$detail.html(str+'<button onclick="javascrtpt:btn()">查看打印详情</button>');
-						}else{
-							$detail.html('未曾打印');
-						}
-					}else{
-						toastr.error(data.msg);
-					}
-				}
-			})
+            $(".fixed-table-header-columns").find("th[data-field]").find("div.sortable").removeClass("asc desc")
+            $(".fixed-table-header-columns").find("th[data-field=" + name + "]").find("div.sortable").removeClass("asc desc").addClass(order);
+            fixleftwidth()
+        },
+        onColumnSwitch: function (field, checked) {
+            //setTimeout(function() {
+            var colnumBody = $(".fixed-table-body-columns");
+            var colnumHead = $(".fixed-table-header-columns");
+            var len = $(".fixed-table-body-columns").length;
+            for (var i = 0; i < len - 1; i++) {
+                colnumBody.eq(i).remove()
+                colnumHead.eq(i).remove()
+            }
+            fixleftwidth()
+            //}, 0)
+        },
 
-		},
-	})
+        //监听分页点击事件
+        onPageChange: function (num, type) {
+            pageNumber = num;
+        },
+        //选中单个复选框
+        onCheck: function (row) {
+            var checks = $("#checks").val();
+            $("#checks").val(checks += "'" + row.patientId + "',");
+        },
+        //取消单个复选框
+        onUncheck: function (row) {
+            var checks = $("#checks").val();
+            checks = checks.replace("'" + row.patientId + "',", "");
+            $("#checks").val(checks);
+        },
+        //全选
+        onCheckAll: function (rows) {
+            $("#checks").val("");
+            var checks = '';
+            for (var i = 0; i < rows.length; i++) {
+                checks += "'" + rows[i].patientId + "',"
+            }
+            $("#checks").val(checks);
+        },
+        //全不选
+        onUncheckAll: function (rows) {
+            $("#checks").val("");
+        },
+        //双击事件
+        onDblClickRow: function (row) {
+            //是否可查看
+            var isShowDetail = row.isShowDetail;
+            var lockStatus = row.lockStatus;
+            var unlockOper = row.unlockOper;
+            if (lockStatus != '' && lockStatus == 1 && unlockOper == 1) {
+                toastr.warning("不可查看,已被锁定!")
+            } else {
+                if (null != isShowDetail && isShowDetail == 1 || showRecord == "1") {
+                    var url = path + '/commom/showRecordBlood?patientId=' + row.patientId;
+                    window.open(url);
+                } else {
+                    toastr.warning("不可查看,必须申请通过!")
+                }
+            }
+        },
+        //展开详情事件
+        onExpandRow: function (index, row, $detail) {//點擊datagrid 展開按鈕事件
+            var patientId = row.patientId;
+            //查询打印简要
+            $.ajax({
+                type: 'get',
+                url: path + '/printInfoList/getPrintCount',
+                dataType: 'json',
+                data: {patientId: patientId},
+                success: function (data) {
+                    if (data.code == 0) {
+                        var result = data.data;
+                        var str = "";
+                        if (result != null && result != '') {
+                            for (var i = 0; i < result.length; i++) {
+                                str += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+                                str += "打印张数:<span style='color: red'>" + result[i].printCount + "</span>;打印时间:<span style='color: red'>" + result[i].createTime + "</span>;" +
+                                    "打印用途:<span style='color: red'>" + result[i].typeName + "</span>;打印者:<span style='color: red'>" + result[i].creater + "</span>";
+                            }
+                            $detail.html(str + '<button onclick="javascrtpt:btn()">查看打印详情</button>');
+                        } else {
+                            $detail.html('未曾打印');
+                        }
+                    } else {
+                        toastr.error(data.msg);
+                    }
+                }
+            })
+
+        },
+    })
 }
-function btn(){
-	var url = path + "/printInfoList/pageUI";
-	window.location.href = url;
+
+function btn() {
+    var url = path + "/printInfoList/pageUI";
+    window.location.href = url;
 }
+
 function fixleftwidth() {
-	setTimeout(function() {
-		$(".fixed-table-body-columns tr td:first-child").height(22);
-		var fixColumnTds = $(".fixed-table-body-columns tr:first-child td");
-		var fixNum = fixColumnTds.length;
-		var tableBody = $(".fixed-table-body tbody tr:first-child td");
+    setTimeout(function () {
+        $(".fixed-table-body-columns tr td:first-child").height(22);
+        var fixColumnTds = $(".fixed-table-body-columns tr:first-child td");
+        var fixNum = fixColumnTds.length;
+        var tableBody = $(".fixed-table-body tbody tr:first-child td");
 
-		for (var i = 0; i < fixNum; i++) {
-			fixColumnTds.eq(i).width(tableBody.eq(i).width())
-		}
-	}, 0)
+        for (var i = 0; i < fixNum; i++) {
+            fixColumnTds.eq(i).width(tableBody.eq(i).width())
+        }
+    }, 0)
 }
+
 fixleftwidth()
-$(window).resize(function() {
-	$('#tableTest1').bootstrapTable('resetView');
-	fixleftwidth()
+$(window).resize(function () {
+    $('#tableTest1').bootstrapTable('resetView');
+    fixleftwidth()
 });
 
-function reLoadTable(){
-	$("#mytab").bootstrapTable('refresh',path+'/template/cutomSearchTable?sql'+$("#sql").val());
-	$('#mytab').bootstrapTable('selectPage', pageNumber);
-	$("#checks").val("");
-	$("#check").val("");
+function reLoadTable() {
+    $("#mytab").bootstrapTable('refresh', path + '/template/cutomSearchTable?sql' + $("#sql").val());
+    $('#mytab').bootstrapTable('selectPage', pageNumber);
+    $("#checks").val("");
+    $("#check").val("");
 }
+
 //判断是否有使用固定列获取选中多行数据
 function getSelectedRow_st(tableId) {
-	//解決固定列导致选择复选框选不中的问题
-	//首先判断表格是否为固定列表格，使用bootstrapTable('getOptions')获取表格的所有配置项，fixedColumns字段判断是否为固定列
-	if($("#"+tableId).bootstrapTable('getOptions').fixedColumns){
-		var selectCheckbox = [];
-		//循环表格的所有行，判断被选中的行，并且push进入selectCheckbox数组
-		for(var i=0;i<$("tbody tr").length;i++){
-			if($(".fixed-table-body-columns tbody tr:nth-child("+(i+1)+") td:first input[name='btSelectItem']").prop("checked")){
-				// console.log($("#table").bootstrapTable("getData")[i]);//输出选中行的所有数据bootstrapTable("getDate"),获取表格的所有数据
-				selectCheckbox.push($("#"+tableId).bootstrapTable("getData")[i]);
-			}
-		}
-		return selectCheckbox;
-	}else{
-		return $("#"+tableId).bootstrapTable('getSelections');
-	}
+    //解決固定列导致选择复选框选不中的问题
+    //首先判断表格是否为固定列表格，使用bootstrapTable('getOptions')获取表格的所有配置项，fixedColumns字段判断是否为固定列
+    if ($("#" + tableId).bootstrapTable('getOptions').fixedColumns) {
+        var selectCheckbox = [];
+        //循环表格的所有行，判断被选中的行，并且push进入selectCheckbox数组
+        for (var i = 0; i < $("tbody tr").length; i++) {
+            if ($(".fixed-table-body-columns tbody tr:nth-child(" + (i + 1) + ") td:first input[name='btSelectItem']").prop("checked")) {
+                // console.log($("#table").bootstrapTable("getData")[i]);//输出选中行的所有数据bootstrapTable("getDate"),获取表格的所有数据
+                selectCheckbox.push($("#" + tableId).bootstrapTable("getData")[i]);
+            }
+        }
+        return selectCheckbox;
+    } else {
+        return $("#" + tableId).bootstrapTable('getSelections');
+    }
 }
+
 //获取选中行
-function getChecked(){
-	var idlist = getSelectedRow_st("mytab");
-	if(idlist.length > 0){
-		var checks = '';
-		for (var i = 0; i < idlist.length; i++) {
-			checks+="'"+idlist[i].patientId + "',";
-		}
-		$("#checks").val(checks);
-	}else{
-		$("#checks").val("");
-	}
+function getChecked() {
+    var idlist = getSelectedRow_st("mytab");
+    if (idlist.length > 0) {
+        var checks = '';
+        for (var i = 0; i < idlist.length; i++) {
+            checks += "'" + idlist[i].patientId + "',";
+        }
+        $("#checks").val(checks);
+    } else {
+        $("#checks").val("");
+    }
 }
+
 //列表行‘操作’按钮
 function AddFunctionAlty(value, row, index) {
-	var patientId = "'" + row.patientId + "'";
-	//是否可查看
-	var isShowDetail = row.isShowDetail;
-	var lockStatus = row.lockStatus;
-	var lockOper = row.lockOper;
-	var unlockOper = row.unlockOper;
-	var borrowingOper = row.borrowingOper;
-	var downloadOper = row.downloadOper;
-	var isDownload = row.isDownload;
-	var str = '';
-	if(lockStatus != '' && lockStatus == 1 && unlockOper == 1){
-		str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="unlock('+patientId+')">解锁</button>';
-	}else{
-		if((null != isShowDetail && isShowDetail == 1) || showRecord == "1"){
-			str += '<a type="button" href="'+path+'/commom/showRecordBlood?patientId='+row.patientId+'" class="btn btn-danger TableView btn-sm" onclick="showDetail('+patientId+')" target="_blank">查看详情</a>';
-		}else{
-			if(borrowingOper == 1){
-				str += '<button type="button" class="btn btn-primary TableView btn-sm" onclick="borrowing('+patientId+')"  data-toggle="modal" data-target="#myModal1">借阅申请</button>';
-			}
-		}
-		//判断可否下载
-		if(downloadOper == 1){
-			if((null != isDownload && isDownload == 1) || downloadRecord == '1'){
-				str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf('+patientId+')">下载PDF</button>';
-			}else{
-				str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="downBorrowing('+patientId+')"  data-toggle="modal" data-target="#myModal1">下载申请</button>';
-			}
-		}
-		if(lockOper == 1){
-			str += '<button type="button" class="btn btn-warning TableView btn-sm" onclick="lock('+patientId+')">锁定</button>';
-		}
-	}
-	return str;
+    var patientId = "'" + row.patientId + "'";
+    //是否可查看
+    var isShowDetail = row.isShowDetail;
+    var lockStatus = row.lockStatus;
+    var lockOper = row.lockOper;
+    var unlockOper = row.unlockOper;
+    var borrowingOper = row.borrowingOper;
+    var downloadOper = row.downloadOper;
+    var isDownload = row.isDownload;
+    var str = '';
+    if (lockStatus != '' && lockStatus == 1 && unlockOper == 1) {
+        str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="unlock(' + patientId + ')">解锁</button>';
+    } else {
+        if ((null != isShowDetail && isShowDetail == 1) || showRecord == "1") {
+            str += '<a type="button" href="' + path + '/commom/showRecordBlood?patientId=' + row.patientId + '" class="btn btn-danger TableView btn-sm" onclick="showDetail(' + patientId + ')" target="_blank">查看详情</a>';
+        } else {
+            if (borrowingOper == 1) {
+                str += '<button type="button" class="btn btn-primary TableView btn-sm" onclick="borrowing(' + patientId + ')"  data-toggle="modal" data-target="#myModal1">借阅申请</button>';
+            }
+        }
+        //判断可否下载
+        if (downloadOper == 1) {
+            if ((null != isDownload && isDownload == 1) || downloadRecord == '1') {
+                str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf(' + patientId + ')">下载PDF</button>';
+            } else {
+                str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="downBorrowing(' + patientId + ')"  data-toggle="modal" data-target="#myModal1">下载申请</button>';
+            }
+        }
+        if (lockOper == 1) {
+            str += '<button type="button" class="btn btn-warning TableView btn-sm" onclick="lock(' + patientId + ')">锁定</button>';
+        }
+    }
+    return str;
 }
+
 /***********************************************按钮功能*****************************************************************/
 //清空功能
-function clearForm(){
-	document.forms[0].reset();
-	$("#dis_dept").selectpicker("refresh");
+function clearForm() {
+    document.forms[0].reset();
+    $("#dis_dept").selectpicker("refresh");
 }
 
 //批量下载功能
-function downloadZip(typeId){
-	var patientIds = "";
-	getChecked();
-	var checks = $("#checks").val();
-	if(checks != ''){
-		patientIds = powerPotient(checks, true,typeId);
-		if(patientIds != ''){
-			patientIds = patientIds.substring(0,patientIds.length-1);
-			post(path+'/template/downloadBloodZip',{"patientIds":patientIds,"flag":$("#flag").val()});
-		}else{
-			toastr.warning("必须申请通过!")
-		}
-	}else{
-		var sql = $("#sql").val();
-		if(sql != '') {
-			var rows = $("#rows").val();
-			if(rows != '' && rows <= 1000){
-				Common.confirm({
-					title: "提示",
-					message: "没有选中，您确定要按搜索栏条件下载?",
-					operate: function (reselt) {
-						if (reselt) {
-							getSql();
-							var sql = $("#sql").val();
-							if (sql != '') {
-								$.ajax({
-									type: 'post',
-									url: path + '/template/getPatientIdsBySql',
-									data: {sql: sql},
-									dataType: 'json',
-									success: function (data) {
-										if (data != null) {
-											patientIds = powerPotient(data, false,typeId);
-											if (patientIds != '') {
-												patientIds = patientIds.substring(0, patientIds.length - 1);
-												//按整份下载
-												post(path+'/template/downloadBloodZip',{"patientIds":patientIds,"flag":$("#flag").val()});
-											}else {
-												toastr.warning("必须申请通过!")
-											}
-										} else {
-											toastr.warning("没有可下载的内容！")
-										}
-									}
-								})
-							}
-						} else {
-							toastr.warning("没有可下载的内容！")
-						}
-					}
-				})
-			}else{
-				toastr.warning("为了用户体验，限制批量操作不超过1000条数据!");
-			}
-		}else{
-			toastr.warning("搜索条件不可为空!");
-		}
-	}
+function downloadZip(typeId) {
+    var patientIds = "";
+    getChecked();
+    var checks = $("#checks").val();
+    if (checks != '') {
+        patientIds = powerPotient(checks, true, typeId);
+        if (patientIds != '') {
+            patientIds = patientIds.substring(0, patientIds.length - 1);
+            post(path + '/template/downloadBloodZip', {"patientIds": patientIds, "flag": $("#flag").val()});
+        } else {
+            toastr.warning("必须申请通过!")
+        }
+    } else {
+        var sql = $("#sql").val();
+        if (sql != '') {
+            var rows = $("#rows").val();
+            if (rows != '' && rows <= 1000) {
+                Common.confirm({
+                    title: "提示",
+                    message: "没有选中，您确定要按搜索栏条件下载?",
+                    operate: function (reselt) {
+                        if (reselt) {
+                            getSql();
+                            var sql = $("#sql").val();
+                            if (sql != '') {
+                                $.ajax({
+                                    type: 'post',
+                                    url: path + '/template/getPatientIdsBySql',
+                                    data: {sql: sql},
+                                    dataType: 'json',
+                                    success: function (data) {
+                                        if (data != null) {
+                                            patientIds = powerPotient(data, false, typeId);
+                                            if (patientIds != '') {
+                                                patientIds = patientIds.substring(0, patientIds.length - 1);
+                                                //按整份下载
+                                                post(path + '/template/downloadBloodZip', {
+                                                    "patientIds": patientIds,
+                                                    "flag": $("#flag").val()
+                                                });
+                                            } else {
+                                                toastr.warning("必须申请通过!")
+                                            }
+                                        } else {
+                                            toastr.warning("没有可下载的内容！")
+                                        }
+                                    }
+                                })
+                            }
+                        } else {
+                            toastr.warning("没有可下载的内容！")
+                        }
+                    }
+                })
+            } else {
+                toastr.warning("为了用户体验，限制批量操作不超过1000条数据!");
+            }
+        } else {
+            toastr.warning("搜索条件不可为空!");
+        }
+    }
 }
+
 //下载pdf功能
-function downloadPdf(patientId){
-	patientId = "'"+patientId+"'";
-	//查询是否有图片
-	$.ajax({
-		type:'get',
-		url:path+'/template/getScanCountByPatientId',
-		data:{patientId:patientId,flag:$("#flag").val()},
-		success:function(data){
-			if(data == 1){
-				post(path + '/template/downloadPdfBlood', {"patientIds": patientId,"flag":$("#flag").val()});
-			}else{
-				toastr.warning("找不到影像资料!");
-			}
-		}
-	})
+function downloadPdf(patientId) {
+    patientId = "'" + patientId + "'";
+    //查询是否有图片
+    $.ajax({
+        type: 'get',
+        url: path + '/template/getScanCountByPatientId',
+        data: {patientId: patientId, flag: $("#flag").val()},
+        success: function (data) {
+            if (data == 1) {
+                post(path + '/template/downloadPdfBlood', {"patientIds": patientId, "flag": $("#flag").val()});
+            } else {
+                toastr.warning("找不到影像资料!");
+            }
+        }
+    })
 }
+
 //定义空的inputValue方法
-function getInputValue(){
-	//判断是否有搜索条件
-	//所有input
-	var isInputValue = false;
-	$('.inputValue').each(function(){
-		var val = $(this).val();
-		if(val != ''){
-			isInputValue = true;
-			return;
-		}
-	})
-	//性别
-	if(!isInputValue){
-		$('input[class=sexInput]:checked').each(function(){
-			var val = $(this).val();
-			if(val != ''){
-				isInputValue = true;
-				return;
-			}
-		})
-		//限手术
-		var isOperInput = $('.isOperInput').val();
-		if(isOperInput == 1){
-			isInputValue = true;
-		}
-	}
-	return isInputValue;
+function getInputValue() {
+    //判断是否有搜索条件
+    //所有input
+    var isInputValue = false;
+    $('.inputValue').each(function () {
+        var val = $(this).val();
+        if (val != '') {
+            isInputValue = true;
+            return;
+        }
+    })
+    //性别
+    if (!isInputValue) {
+        $('input[class=sexInput]:checked').each(function () {
+            var val = $(this).val();
+            if (val != '') {
+                isInputValue = true;
+                return;
+            }
+        })
+        //限手术
+        var isOperInput = $('.isOperInput').val();
+        if (isOperInput == 1) {
+            isInputValue = true;
+        }
+    }
+    return isInputValue;
 }
 
 //加载申请借阅类型
-function loadApplyType(type){
-	$.ajax({
-		type:'get',
-		url:path+'/template/getLoadApplyType',
-		dataType:'json',
-		success:function (data) {
-			if(null != data){
-				$("#applyType").empty();
-				var html = '';
-				for (var i = 0; i < data.length; i++) {
-					if(data[i].code != ''){
-						if(type == 1 && data[i].code != 3){
-							html += '<option value="'+data[i].code+'">'+data[i].name+'</option>';
-						}
-						if(type == 2 && data[i].code == 3){
-							html += '<option value="'+data[i].code+'">'+data[i].name+'</option>';
-						}
-					}
-				}
-				$("#applyType").append(html);
-			}
-		}
-	})
+function loadApplyType(type) {
+    $.ajax({
+        type: 'get',
+        url: path + '/template/getLoadApplyType',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data) {
+                $("#applyType").empty();
+                var html = '';
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].code != '') {
+                        if (type == 1 && data[i].code != 3) {
+                            html += '<option value="' + data[i].code + '">' + data[i].name + '</option>';
+                        }
+                        if (type == 2 && data[i].code == 3) {
+                            html += '<option value="' + data[i].code + '">' + data[i].name + '</option>';
+                        }
+                    }
+                }
+                $("#applyType").append(html);
+            }
+        }
+    })
 }
+
 //单个申请借阅
-function borrowing(patientId){
-	$("#typeId").val('approves');
-	//加载申请借阅类型
-	loadApplyType(1);
-	setFormToken();
-	document.forms[1].reset();
-	$("#approveId").val("");
-	$("#check").val("'"+patientId+"',");
-	//查询该记录是否有保存未提交的记录
-	$.ajax({
-		type:'post',
-		url:path+'/approve/approveListByAppleStatus?patientId='+patientId+'&type=1',
-		dataType:'json',
-		success:function(data){
-			if(data != null || data != ''){
-				$("#approveId").val(data.id);
-				$("#effeTime").val(data.effeTime);
-				$("#applyType").val(data.applyType);
-				$("#effeDays").val(data.effeDays);
-				$("#applyReason").val(data.applyReason);
-			}
-		}
-	})
+function borrowing(patientId) {
+    $("#typeId").val('approves');
+    //加载申请借阅类型
+    loadApplyType(1);
+    setFormToken();
+    document.forms[1].reset();
+    $("#approveId").val("");
+    $("#check").val("'" + patientId + "',");
+    //查询该记录是否有保存未提交的记录
+    $.ajax({
+        type: 'post',
+        url: path + '/approve/approveListByAppleStatus?patientId=' + patientId + '&type=1',
+        dataType: 'json',
+        success: function (data) {
+            if (data != null || data != '') {
+                $("#approveId").val(data.id);
+                $("#effeTime").val(data.effeTime);
+                $("#applyType").val(data.applyType);
+                $("#effeDays").val(data.effeDays);
+                $("#applyReason").val(data.applyReason);
+            }
+        }
+    })
 }
+
 //批量申请借阅
-function borrowings(){
-	pickTime("effeTime");
-	$("#typeId").val('approves');
-	//加载申请借阅类型
-	loadApplyType(1);
-	$("#name1").val("");
-	setFormToken();
-	document.forms[1].reset();
-	$("#approveId").val("");
-	getChecked();
-	if($("#checks").val() == ''){
-		//搜索框值不能为空
-		var flag = true;
-		$("#block").children().find('[class=inputDiv]').find('input').each(function(){
-			var val = $(this).val();
-			if(val == ''){
-				flag = false;
-				return false;
-			}
-		})
-		var isInputValue = getInputValue();
-		if(!flag && isInputValue==''){
-			toastr.warning("搜索条件不能为空!");
-		}else {
-			getSql();
-			var sql = $("#sql").val();
-			if (sql != '') {
-				var rows = $("#rows").val();
-				if(rows != '' && rows <= 5000){
-					if (confirm('没有选中，您确定要按搜索栏条件申请?')) {
-						$.ajax({
-							type: 'post',
-							url: path + '/template/getPatientIdsBySql',
-							data: {sql: sql},
-							dataType: 'json',
-							async:false,
-							success: function (data) {
-								if (data != null) {
-									$("#patientIds").val(data);
-								}
-							}
-						})
-						$('#borrowings').attr("data-toggle", "modal");
-						$('#borrowings').attr("data-target", "#myModal1");
-					}else{
-						$('#borrowings').removeAttr("data-toggle", "modal");
-						$('#borrowings').removeAttr("data-target", "#myModal1");
-					}
-				}else{
-					toastr.warning("为了用户体验，限制批量操作不超过5000条数据!");
-				}
-			} else {
-				toastr.warning("至少选中一条!");
-			}
-		}
-	}else{
-		$('#borrowings').attr("data-toggle", "modal");
-		$('#borrowings').attr("data-target", "#myModal1");
-	}
+function borrowings() {
+    pickTime("effeTime", null);
+    $("#typeId").val('approves');
+    //加载申请借阅类型
+    loadApplyType(1);
+    $("#name1").val("");
+    setFormToken();
+    document.forms[1].reset();
+    $("#approveId").val("");
+    getChecked();
+    if ($("#checks").val() == '') {
+        //搜索框值不能为空
+        var flag = true;
+        $("#block").children().find('[class=inputDiv]').find('input').each(function () {
+            var val = $(this).val();
+            if (val == '') {
+                flag = false;
+                return false;
+            }
+        })
+        var isInputValue = getInputValue();
+        if (!flag && isInputValue == '') {
+            toastr.warning("搜索条件不能为空!");
+        } else {
+            getSql();
+            var sql = $("#sql").val();
+            if (sql != '') {
+                var rows = $("#rows").val();
+                if (rows != '' && rows <= 5000) {
+                    if (confirm('没有选中，您确定要按搜索栏条件申请?')) {
+                        $.ajax({
+                            type: 'post',
+                            url: path + '/template/getPatientIdsBySql',
+                            data: {sql: sql},
+                            dataType: 'json',
+                            async: false,
+                            success: function (data) {
+                                if (data != null) {
+                                    $("#patientIds").val(data);
+                                }
+                            }
+                        })
+                        $('#borrowings').attr("data-toggle", "modal");
+                        $('#borrowings').attr("data-target", "#myModal1");
+                    } else {
+                        $('#borrowings').removeAttr("data-toggle", "modal");
+                        $('#borrowings').removeAttr("data-target", "#myModal1");
+                    }
+                } else {
+                    toastr.warning("为了用户体验，限制批量操作不超过5000条数据!");
+                }
+            } else {
+                toastr.warning("至少选中一条!");
+            }
+        }
+    } else {
+        $('#borrowings').attr("data-toggle", "modal");
+        $('#borrowings').attr("data-target", "#myModal1");
+    }
 }
+
 //单个下载申请
-function downBorrowing(patientId){
-	$("#typeId").val('loads');
-	//加载申请借阅类型
-	loadApplyType(1);
-	setFormToken();
-	document.forms[1].reset();
-	$("#approveId").val("");
-	$("#check").val("'"+patientId+"',");
-	//查询该记录是否有保存未提交的记录
-	$.ajax({
-		type:'post',
-		url:path+'/approve/approveListByAppleStatus?patientId='+patientId+'&type=1',
-		dataType:'json',
-		success:function(data){
-			if(data != null || data != ''){
-				$("#approveId").val(data.id);
-				$("#effeTime").val(data.effeTime);
-				$("#applyType").val(data.applyType);
-				$("#effeDays").val(data.effeDays);
-				$("#applyReason").val(data.applyReason);
-			}
-		}
-	})
+function downBorrowing(patientId) {
+    $("#typeId").val('loads');
+    //加载申请借阅类型
+    loadApplyType(1);
+    setFormToken();
+    document.forms[1].reset();
+    $("#approveId").val("");
+    $("#check").val("'" + patientId + "',");
+    //查询该记录是否有保存未提交的记录
+    $.ajax({
+        type: 'post',
+        url: path + '/approve/approveListByAppleStatus?patientId=' + patientId + '&type=1',
+        dataType: 'json',
+        success: function (data) {
+            if (data != null || data != '') {
+                $("#approveId").val(data.id);
+                $("#effeTime").val(data.effeTime);
+                $("#applyType").val(data.applyType);
+                $("#effeDays").val(data.effeDays);
+                $("#applyReason").val(data.applyReason);
+            }
+        }
+    })
 }
+
 //批量下载借阅
-function downBorrowings(){
-	pickTime("effeTime");
-	$("#typeId").val('loads');
-	//加载申请借阅类型
-	loadApplyType(1);
-	$("#name1").val("");
-	setFormToken();
-	document.forms[1].reset();
-	$("#approveId").val("");
-	getChecked();
-	if($("#checks").val() == ''){
-		//搜索框值不能为空
-		var flag = true;
-		$("#block").children().find('[class=inputDiv]').find('input').each(function(){
-			var val = $(this).val();
-			if(val == ''){
-				flag = false;
-				return false;
-			}
-		})
-		var isInputValue = getInputValue();
-		if(!flag && isInputValue==''){
-			toastr.warning("搜索条件不能为空!");
-		}else {
-			getSql();
-			var sql = $("#sql").val();
-			if (sql != '') {
-				var rows = $("#rows").val();
-				if(rows != '' && rows <= 5000){
-					if (confirm('没有选中，您确定要按搜索栏条件申请?')) {
-						$.ajax({
-							type: 'post',
-							url: path + '/template/getPatientIdsBySql',
-							data: {sql: sql},
-							dataType: 'json',
-							async:false,
-							success: function (data) {
-								if (data != null) {
-									$("#patientIds").val(data);
-								}
-							}
-						})
-						$('#downBorrowings').attr("data-toggle", "modal");
-						$('#downBorrowings').attr("data-target", "#myModal1");
-					}else{
-						$('#downBorrowings').removeAttr("data-toggle", "modal");
-						$('#downBorrowings').removeAttr("data-target", "#myModal1");
-					}
-				}else{
-					toastr.warning("为了用户体验，限制批量操作不超过5000条数据!");
-				}
-			} else {
-				toastr.warning("至少选中一条!");
-			}
-		}
-	}else{
-		$('#downBorrowings').attr("data-toggle", "modal");
-		$('#downBorrowings').attr("data-target", "#myModal1");
-	}
+function downBorrowings() {
+    pickTime("effeTime", null);
+    $("#typeId").val('loads');
+    //加载申请借阅类型
+    loadApplyType(2);
+    $("#name1").val("");
+    setFormToken();
+    document.forms[1].reset();
+    $("#approveId").val("");
+    getChecked();
+    if ($("#checks").val() == '') {
+        //搜索框值不能为空
+        var flag = true;
+        $("#block").children().find('[class=inputDiv]').find('input').each(function () {
+            var val = $(this).val();
+            if (val == '') {
+                flag = false;
+                return false;
+            }
+        })
+        var isInputValue = getInputValue();
+        if (!flag && isInputValue == '') {
+            toastr.warning("搜索条件不能为空!");
+        } else {
+            getSql();
+            var sql = $("#sql").val();
+            if (sql != '') {
+                var rows = $("#rows").val();
+                if (rows != '' && rows <= 5000) {
+                    if (confirm('没有选中，您确定要按搜索栏条件申请?')) {
+                        $.ajax({
+                            type: 'post',
+                            url: path + '/template/getPatientIdsBySql',
+                            data: {sql: sql},
+                            dataType: 'json',
+                            async: false,
+                            success: function (data) {
+                                if (data != null) {
+                                    $("#patientIds").val(data);
+                                }
+                            }
+                        })
+                        $('#downBorrowings').attr("data-toggle", "modal");
+                        $('#downBorrowings').attr("data-target", "#myModal1");
+                    } else {
+                        $('#downBorrowings').removeAttr("data-toggle", "modal");
+                        $('#downBorrowings').removeAttr("data-target", "#myModal1");
+                    }
+                } else {
+                    toastr.warning("为了用户体验，限制批量操作不超过5000条数据!");
+                }
+            } else {
+                toastr.warning("至少选中一条!");
+            }
+        }
+    } else {
+        $('#downBorrowings').attr("data-toggle", "modal");
+        $('#downBorrowings').attr("data-target", "#myModal1");
+    }
 }
+
 //模态框保存操作
-function save(){
-	var typeId = $("#typeId").val();
-	saveMethod(1,"保存",typeId);
+function save() {
+    var typeId = $("#typeId").val();
+    saveMethod(1, "保存", typeId);
 }
+
 //模态框提交操作
-function add(){
-	var typeId = $("#typeId").val();
-	saveMethod(2,"提交",typeId);
+function add() {
+    var typeId = $("#typeId").val();
+    saveMethod(2, "提交", typeId);
 }
 
 //封装模态框保存公共方法，applyState:提交状态1保存未提交2已提交.msg:操作后提示信息
-function saveMethod(applyState,msg,typeId){
-	if($("#effeTime").val() != ''){
-		var patientIds = $("#check").val();
-		if(patientIds == '') {
-			patientIds = $("#checks").val();
-		}
-		if(patientIds == ''){
-			patientIds = $("#patientIds").val();
-		}
-		if (patientIds != '') {
-			//过滤已可查阅的patientId集合;
-			patientIds = powerPotient(patientIds,false,typeId);
-			if(patientIds != ''){
-				patientIds = patientIds.substring(0, patientIds.length - 1);
-				var id = $("#approveId").val();
-				var effeTime = $("#effeTime").val();
-				var effeDays = $("#effeDays").val();
-				var applyType = $("#applyType").val();
-				var applyReason = $("#applyReason").val();
-				$.ajax({
-					type:'post',
-					url:path+'/approve/addApplyApprove',
-					data:{id:id,applyState:applyState,effeTime:effeTime,effeDays:effeDays,applyType:applyType,applyReason:applyReason,patientIds:patientIds,formToken:$("#formToken").val()},
-					dataType:'json',
-					success:function(data){
-						if(data!=null && data.code == 0){
-							if(applyState == 1){
-								toastr.success("保存成功!");
-							}else if(applyState == 2){
-								toastr.success("申请成功，目前审核中，请耐心等待!");
-								document.forms[1].reset();
-							}
-							$('#myModal1').modal('hide');
-							reLoadTable();
-						}else{
-							toastr.error(data.msg);
-						}
-					}
-				})
-			}else{
-				toastr.warning("没有可申请的记录")
-			}
-		} else {
-			toastr.warning("请至少选中一条记录")
-		}
-	}else{
-		toastr.warning("有效时间不能为空!");
-		$("#effeTime").focus();
-	}
+function saveMethod(applyState, msg, typeId) {
+    if ($("#effeTime").val() != '') {
+        var patientIds = $("#check").val();
+        if (patientIds == '') {
+            patientIds = $("#checks").val();
+        }
+        if (patientIds == '') {
+            patientIds = $("#patientIds").val();
+        }
+        if (patientIds != '') {
+            //过滤已可查阅的patientId集合;
+            patientIds = powerPotient(patientIds, false, typeId);
+            if (patientIds != '') {
+                patientIds = patientIds.substring(0, patientIds.length - 1);
+                var id = $("#approveId").val();
+                var effeTime = $("#effeTime").val();
+                var effeDays = $("#effeDays").val();
+                var applyType = $("#applyType").val();
+                var applyReason = $("#applyReason").val();
+                $.ajax({
+                    type: 'post',
+                    url: path + '/approve/addApplyApprove',
+                    data: {
+                        id: id,
+                        applyState: applyState,
+                        effeTime: effeTime,
+                        effeDays: effeDays,
+                        applyType: applyType,
+                        applyReason: applyReason,
+                        patientIds: patientIds,
+                        formToken: $("#formToken").val()
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data != null && data.code == 0) {
+                            if (applyState == 1) {
+                                toastr.success("保存成功!");
+                            } else if (applyState == 2) {
+                                toastr.success("申请成功，目前审核中，请耐心等待!");
+                                document.forms[1].reset();
+                            }
+                            $('#myModal1').modal('hide');
+                            reLoadTable();
+                        } else {
+                            toastr.error(data.msg);
+                        }
+                    }
+                })
+            } else {
+                toastr.warning("没有可申请的记录")
+            }
+        } else {
+            toastr.warning("请至少选中一条记录")
+        }
+    } else {
+        toastr.warning("有效时间不能为空!");
+        $("#effeTime").focus();
+    }
 }
+
 //单个锁定
-function lock(patientId){
-	patientId = "'"+patientId+"'";
-	lockMethod(patientId);
+function lock(patientId) {
+    patientId = "'" + patientId + "'";
+    lockMethod(patientId);
 }
+
 //批量锁定
-function blocks(){
-	var locks = $("#locks").val();
-	var checks = $("#checks").val();
-	if(checks != ''){
-		//过滤已锁定的
-		if(locks != ''){
-			locks = locks.split(",");
-			for (var i = 0; i < locks.length; i++) {
-				if(locks[i] != '' && checks.indexOf(locks[i]) != -1){
-					checks = checks.replace(locks[i]+",","");
-				}
-			}
-		}
-		if(checks != ''){
-			checks = checks.substring(0,checks.length-1);
-			lockMethod(checks);
-		}else{
-			toastr.warning("没有可锁定的对象！")
-		}
-	}else{
-		if($("#rows").val() > 1000){
-			toastr.warning("数据量大,暂支持1000条内数据批量锁定");
-		}else {
-			getSql();
-			var sql = $("#sql").val();
-			if (sql != '') {
-				Common.confirm({
-					title: "提示",
-					message: "没有选中，您确定要按搜索栏条件锁定?",
-					operate: function (reselt) {
-						if (reselt) {
-							$.ajax({
-								type: 'post',
-								url: path + '/template/getPatientIdsBySql',
-								data: {sql: sql},
-								dataType: 'json',
-								success: function (data) {
-									if (data != null) {
-										var patientIds = data;
-										if (locks != '') {
-											locks = locks.split(",");
-											for (var i = 0; i < locks.length; i++) {
-												if (locks[i] != '' && patientIds.indexOf(locks[i]) != -1) {
-													patientIds = patientIds.replace(locks[i] + ",", "");
-												}
-											}
-										}
-										if (patientIds != '') {
-											patientIds = patientIds.substring(0, patientIds.length - 1);
-											lockMethod(patientIds);
-										}
-									} else {
-										toastr.warning("没有可锁定的对象！")
-									}
-								}
-							})
-						}
-					}
-				})
-			} else {
-				toastr.warning("搜索内容不能为空!")
-			}
-		}
-	}
+function blocks() {
+    var locks = $("#locks").val();
+    var checks = $("#checks").val();
+    if (checks != '') {
+        //过滤已锁定的
+        if (locks != '') {
+            locks = locks.split(",");
+            for (var i = 0; i < locks.length; i++) {
+                if (locks[i] != '' && checks.indexOf(locks[i]) != -1) {
+                    checks = checks.replace(locks[i] + ",", "");
+                }
+            }
+        }
+        if (checks != '') {
+            checks = checks.substring(0, checks.length - 1);
+            lockMethod(checks);
+        } else {
+            toastr.warning("没有可锁定的对象！")
+        }
+    } else {
+        if ($("#rows").val() > 1000) {
+            toastr.warning("数据量大,暂支持1000条内数据批量锁定");
+        } else {
+            getSql();
+            var sql = $("#sql").val();
+            if (sql != '') {
+                Common.confirm({
+                    title: "提示",
+                    message: "没有选中，您确定要按搜索栏条件锁定?",
+                    operate: function (reselt) {
+                        if (reselt) {
+                            $.ajax({
+                                type: 'post',
+                                url: path + '/template/getPatientIdsBySql',
+                                data: {sql: sql},
+                                dataType: 'json',
+                                success: function (data) {
+                                    if (data != null) {
+                                        var patientIds = data;
+                                        if (locks != '') {
+                                            locks = locks.split(",");
+                                            for (var i = 0; i < locks.length; i++) {
+                                                if (locks[i] != '' && patientIds.indexOf(locks[i]) != -1) {
+                                                    patientIds = patientIds.replace(locks[i] + ",", "");
+                                                }
+                                            }
+                                        }
+                                        if (patientIds != '') {
+                                            patientIds = patientIds.substring(0, patientIds.length - 1);
+                                            lockMethod(patientIds);
+                                        }
+                                    } else {
+                                        toastr.warning("没有可锁定的对象！")
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            } else {
+                toastr.warning("搜索内容不能为空!")
+            }
+        }
+    }
 }
+
 //解锁
-function unlock(patientId){
-	$.ajax({
-		type:'post',
-		url:path+'/template/updateLockByPatientId?patientId='+patientId,
-		dataType:'json',
-		success:function(data){
-			if(data.code == 0){
-				toastr.success("解锁成功!");
-				getLockPatientIds();
-				reLoadTable();
-			}else{
-				toastr.error("解锁失败！")
-			}
-		}
-	})
+function unlock(patientId) {
+    $.ajax({
+        type: 'post',
+        url: path + '/template/updateLockByPatientId?patientId=' + patientId,
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 0) {
+                toastr.success("解锁成功!");
+                getLockPatientIds();
+                reLoadTable();
+            } else {
+                toastr.error("解锁失败！")
+            }
+        }
+    })
 }
+
 //批量解锁
-function unlocks(){
-	var locks = $("#locks").val();
-	var checks = $("#checks").val();
-	if(checks != ''){
-		//过滤已锁定的
-		if(locks != ''){
-			locks = locks.split(",");
-			var newChecks = "";
-			for (var i = 0; i < locks.length; i++) {
-				if(locks[i] != '' && checks.indexOf(locks[i]) != -1){
-					newChecks += locks[i]+",";
-				}
-			}
-			if(newChecks != ''){
-				newChecks = newChecks.substring(0,newChecks.length-1);
-				//解锁的方法
-				unlocksMethods(newChecks);
-			}else{
-				toastr.warning("没有可解锁的对象!");
-			}
-		}else{
-			toastr.warning("没有可解锁的对象!");
-		}
-	}else{
-		if($("#rows").val() > 1000){
-			toastr.warning("数据量大,暂支持1000条内数据批量解锁");
-		}else {
-			getSql();
-			var sql = $("#sql").val();
-			if (sql != '') {
-				Common.confirm({
-					title: "提示",
-					message: "没有选中，您确定要按搜索栏条件批量解锁?",
-					operate: function (reselt) {
-						if (reselt) {
-							$.ajax({
-								type: 'post',
-								url: path + '/template/getPatientIdsBySql',
-								data: {sql: sql},
-								dataType: 'json',
-								success: function (data) {
-									if (data != null) {
-										var patientIds = data;
-										if (locks != '') {
-											locks = locks.split(",");
-											for (var i = 0; i < locks.length; i++) {
-												if (locks[i] != '' && patientIds.indexOf(locks[i]) == -1) {
-													patientIds = patientIds.replace(locks[i] + ",", "");
-												}
-											}
-										}
-										if (patientIds != '') {
-											patientIds = patientIds.substring(0, patientIds.length - 1);
-											//批量解锁的方法
-											unlocksMethods(patientIds);
-										}
-									} else {
-										toastr.warning("没有可解锁的对象！")
-									}
-								}
-							})
-						}
-					}
-				})
-			} else {
-				toastr.warning("搜索内容不能为空!")
-			}
-		}
-	}
+function unlocks() {
+    var locks = $("#locks").val();
+    var checks = $("#checks").val();
+    if (checks != '') {
+        //过滤已锁定的
+        if (locks != '') {
+            locks = locks.split(",");
+            var newChecks = "";
+            for (var i = 0; i < locks.length; i++) {
+                if (locks[i] != '' && checks.indexOf(locks[i]) != -1) {
+                    newChecks += locks[i] + ",";
+                }
+            }
+            if (newChecks != '') {
+                newChecks = newChecks.substring(0, newChecks.length - 1);
+                //解锁的方法
+                unlocksMethods(newChecks);
+            } else {
+                toastr.warning("没有可解锁的对象!");
+            }
+        } else {
+            toastr.warning("没有可解锁的对象!");
+        }
+    } else {
+        if ($("#rows").val() > 1000) {
+            toastr.warning("数据量大,暂支持1000条内数据批量解锁");
+        } else {
+            getSql();
+            var sql = $("#sql").val();
+            if (sql != '') {
+                Common.confirm({
+                    title: "提示",
+                    message: "没有选中，您确定要按搜索栏条件批量解锁?",
+                    operate: function (reselt) {
+                        if (reselt) {
+                            $.ajax({
+                                type: 'post',
+                                url: path + '/template/getPatientIdsBySql',
+                                data: {sql: sql},
+                                dataType: 'json',
+                                success: function (data) {
+                                    if (data != null) {
+                                        var patientIds = data;
+                                        if (locks != '') {
+                                            locks = locks.split(",");
+                                            for (var i = 0; i < locks.length; i++) {
+                                                if (locks[i] != '' && patientIds.indexOf(locks[i]) == -1) {
+                                                    patientIds = patientIds.replace(locks[i] + ",", "");
+                                                }
+                                            }
+                                        }
+                                        if (patientIds != '') {
+                                            patientIds = patientIds.substring(0, patientIds.length - 1);
+                                            //批量解锁的方法
+                                            unlocksMethods(patientIds);
+                                        }
+                                    } else {
+                                        toastr.warning("没有可解锁的对象！")
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            } else {
+                toastr.warning("搜索内容不能为空!")
+            }
+        }
+    }
 }
+
 //封装锁定方法
-function lockMethod(patientId){
-	Common.confirm({
-		title: "提示",
-		message: "请确认是否锁定该数据?",
-		operate: function (reselt) {
-			if (reselt) {
-				$.ajax({
-					type: 'post',
-					url: path + '/template/addLockByPatientId',
-					data: {patientIds: patientId},
-					dataType: 'json',
-					success: function (data) {
-						if (data.code == 0) {
-							toastr.success("锁定成功!");
-							getLockPatientIds();
-							reLoadTable();
-						} else {
-							toastr.error("锁定失败！")
-						}
-					}
-				})
-			}
-		}
-	})
+function lockMethod(patientId) {
+    Common.confirm({
+        title: "提示",
+        message: "请确认是否锁定该数据?",
+        operate: function (reselt) {
+            if (reselt) {
+                $.ajax({
+                    type: 'post',
+                    url: path + '/template/addLockByPatientId',
+                    data: {patientIds: patientId},
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.code == 0) {
+                            toastr.success("锁定成功!");
+                            getLockPatientIds();
+                            reLoadTable();
+                        } else {
+                            toastr.error("锁定失败！")
+                        }
+                    }
+                })
+            }
+        }
+    })
 }
+
 //封装批量解锁方法
-function unlocksMethods(patientIds){
-	$.ajax({
-		type:'post',
-		url:path+'/template/updateLockByPatientIds',
-		data:{patientIds:patientIds},
-		async:false,
-		dataType:'json',
-		success:function(data){
-			if(data.code == 0){
-				toastr.success("解锁成功!");
-				getLockPatientIds();
-				reLoadTable();
-			}else{
-				toastr.error("解锁失败！")
-			}
-		}
-	})
+function unlocksMethods(patientIds) {
+    $.ajax({
+        type: 'post',
+        url: path + '/template/updateLockByPatientIds',
+        data: {patientIds: patientIds},
+        async: false,
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 0) {
+                toastr.success("解锁成功!");
+                getLockPatientIds();
+                reLoadTable();
+            } else {
+                toastr.error("解锁失败！")
+            }
+        }
+    })
 }
+
 //查询被锁定的patienId集合
-function getLockPatientIds(){
-	$("#locks").val("");
-	$.ajax({
-		type:'post',
-		url:path+'/emrLock/getLoctPatientIds',
-		dataType:'json',
-		async:false,
-		success:function(data){
-			if(data != null && data != ''){
-				$("#locks").val(data);
-			}
-		}
-	})
+function getLockPatientIds() {
+    $("#locks").val("");
+    $.ajax({
+        type: 'post',
+        url: path + '/emrLock/getLoctPatientIds',
+        dataType: 'json',
+        async: false,
+        success: function (data) {
+            if (data != null && data != '') {
+                $("#locks").val(data);
+            }
+        }
+    })
 }
+
 //过滤下载，导出pdf，查看详情的patientId集合:typeId:已借阅审批病案id集合或已下载审批病案id集合
-function powerPotient(patientIds,flag,typeId){
-	//有权限的过滤
-	//通过且未过期的可查看的
-	var approves = $("#"+typeId).val();
-	if(typeId == 'loads' && downloadRecord == "1"){
+function powerPotient(patientIds, flag, typeId) {
+    //有权限的过滤
+    //通过且未过期的可查看的
+    var approves = $("#" + typeId).val();
+    if (typeId == 'loads' && downloadRecord == "1") {
 
-	}else{
-		if(approves != '') {
-			var patientIdList = patientIds.split(",");
-			var approveList = approves.split(",");
-			patientIds = '';
-			for (var i = 0; i < patientIdList.length; i++) {
-				if(patientIdList[i] != ''){
-					//定义是否包含
-					var flagPatinetId = false;
-					for (var j = 0; j < approveList.length; j++) {
-						//包含
-						if (approveList[j] != '' && patientIdList[i].indexOf(approveList[j]) != -1) {
-							flagPatinetId = true;
-							break;
-						}
-					}
-					if(flag){
-						if(flagPatinetId){
-							patientIds  +=	patientIdList[i]+",";
-						}
-					}else{
-						if(!flagPatinetId){
-							patientIds  +=	patientIdList[i]+",";
-						}
-					}
-				}
-			}
-		}else{
-			if(typeId == 'loads' && flag){
-				patientIds = "";
-			}
-		}
-	}
-	if(patientIds != ''){
-		var patientIdList = patientIds.split(",");
-		//锁定的
-		var locks = $("#locks").val();
-		if(locks != '') {
-			var lockList = locks.split(",");
-			for (var i = 0; i < patientIdList.length; i++) {
-				for (var j = 0; j < lockList.length; j++) {
-					if (lockList[j] != '' && patientIdList[i] == lockList[j]) {
-						//包含
-						patientIds = patientIds.replace(patientIdList[i]+',',"");
-					}
-				}
-			}
-		}
-	}
-	return patientIds;
+    } else {
+        if (approves != '') {
+            var patientIdList = patientIds.split(",");
+            var approveList = approves.split(",");
+            patientIds = '';
+            for (var i = 0; i < patientIdList.length; i++) {
+                if (patientIdList[i] != '') {
+                    //定义是否包含
+                    var flagPatinetId = false;
+                    for (var j = 0; j < approveList.length; j++) {
+                        //包含
+                        if (approveList[j] != '' && patientIdList[i].indexOf(approveList[j]) != -1) {
+                            flagPatinetId = true;
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        if (flagPatinetId) {
+                            patientIds += patientIdList[i] + ",";
+                        }
+                    } else {
+                        if (!flagPatinetId) {
+                            patientIds += patientIdList[i] + ",";
+                        }
+                    }
+                }
+            }
+        } else {
+            if (typeId == 'loads' && flag) {
+                patientIds = "";
+            }
+        }
+    }
+    if (patientIds != '') {
+        var patientIdList = patientIds.split(",");
+        //锁定的
+        var locks = $("#locks").val();
+        if (locks != '') {
+            var lockList = locks.split(",");
+            for (var i = 0; i < patientIdList.length; i++) {
+                for (var j = 0; j < lockList.length; j++) {
+                    if (lockList[j] != '' && patientIdList[i] == lockList[j]) {
+                        //包含
+                        patientIds = patientIds.replace(patientIdList[i] + ',', "");
+                    }
+                }
+            }
+        }
+    }
+    return patientIds;
 }
+
 /*********************************************************工具*************************************************************/
 //格式化时间
 function formatTime(datetime, fmt) {
-	if (datetime == null || datetime == 0) {
-		return "";
-	}
-	if (parseInt(datetime) == datetime) {
-		if (datetime.length == 10) {
-			datetime = parseInt(datetime) * 1000;
-		} else if (datetime.length == 13) {
-			datetime = parseInt(datetime);
-		}
-	}
-	datetime = new Date(datetime.substring(0,datetime.replace(/-/g,'/').replace(/T|Z/g,' ').trim().length-11));
-	var o = {
-		"M+" : datetime.getMonth() + 1, //月份
-		"d+" : datetime.getDate(), //日
-		"h+" : datetime.getHours(), //小时
-		"m+" : datetime.getMinutes(), //分
-		"s+" : datetime.getSeconds(), //秒
-		"q+" : Math.floor((datetime.getMonth() + 3) / 3), //季度
-		"S" : datetime.getMilliseconds()
-		//毫秒
-	};
-	if (/(y+)/.test(fmt))
-		fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "")
-			.substr(4 - RegExp.$1.length));
-	for ( var k in o)
-		if (new RegExp("(" + k + ")").test(fmt))
-			fmt = fmt.replace(RegExp.$1,
-				(RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k])
-					.substr(("" + o[k]).length)));
-	return fmt;
+    if (datetime == null || datetime == 0) {
+        return "";
+    }
+    if (parseInt(datetime) == datetime) {
+        if (datetime.length == 10) {
+            datetime = parseInt(datetime) * 1000;
+        } else if (datetime.length == 13) {
+            datetime = parseInt(datetime);
+        }
+    }
+    datetime = new Date(datetime.substring(0, datetime.replace(/-/g, '/').replace(/T|Z/g, ' ').trim().length - 11));
+    var o = {
+        "M+": datetime.getMonth() + 1, //月份
+        "d+": datetime.getDate(), //日
+        "h+": datetime.getHours(), //小时
+        "m+": datetime.getMinutes(), //分
+        "s+": datetime.getSeconds(), //秒
+        "q+": Math.floor((datetime.getMonth() + 3) / 3), //季度
+        "S": datetime.getMilliseconds()
+        //毫秒
+    };
+    if (/(y+)/.test(fmt))
+        fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "")
+            .substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt))
+            fmt = fmt.replace(RegExp.$1,
+                (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k])
+                    .substr(("" + o[k]).length)));
+    return fmt;
 }
\ No newline at end of file
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
index 06dd8c1..44d3ff4 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -683,7 +683,7 @@ function borrowing(patientId){
 
 //批量申请借阅
 function borrowings(){
-    pickTime("effeTime");
+    pickTime("effeTime", null);
 	$("#typeId").val('approves');
 	//加载申请借阅类型
 	loadApplyType(1);