From f76e2e1ac62d4c8a04324b9adccf22ac9aa73544 Mon Sep 17 00:00:00 2001
From: luolyjava <java888888ly@163.com>
Date: Thu, 9 Apr 2020 17:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commomSearch/CommomSearchController.java  |   12 +
 src/main/java/com/emr/dao/CommomMapper.java   |    6 +
 src/main/resources/config/jdbc.properties     |    2 +-
 src/main/resources/mapper/CommomMapper.xml    |    6 +
 .../commomSearch/commomListqf.jsp             |   19 +-
 .../templateSearch/customSearchIfameqf.jsp    |   14 +-
 .../bootstrap-table/bootstrap-table.js        |    1 +
 .../recordManage/commomSearch/commomListqf.js | 1216 +++++++++--------
 .../templateSearch/customSearchIframeqf.js    |   19 +
 .../templateSearch/searchCommomMethodqf.js    |    4 +-
 10 files changed, 713 insertions(+), 586 deletions(-)

diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
index 44aaa62..def02fb 100644
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@@ -197,6 +197,18 @@ public class CommomSearchController {
         }
     }
 
+    @RequestMapping("getCommonInfo")
+    @ResponseBody
+    public String getCommonInfo(){
+        try {
+            List<CommomVo> commomVoList = commomMapper.selectAllInfo();
+            return JSON.toJSONString(commomVoList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     @RequestMapping("getDept174")
     @ResponseBody
     public String getDept174(){
diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java
index f2b93a2..2724ec0 100644
--- a/src/main/java/com/emr/dao/CommomMapper.java
+++ b/src/main/java/com/emr/dao/CommomMapper.java
@@ -88,4 +88,10 @@ public interface CommomMapper {
      * 按病案号查询patientId,name,admissId
      * */
     List<CommomVo> selectCommomByInpatientNo(@Param("inpatientNo")String inpatientNo);
+
+    /**
+     * 查询病案信息的病案号和病人名称
+     * @return
+     */
+    List<CommomVo> selectAllInfo();
 }
\ No newline at end of file
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index d306f37..98390d2 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -5,7 +5,7 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record
 jdbc.username=sa
-jdbc.password=docus702
+jdbc.password=123456
 
 #dataSource2
 jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java
diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml
index 8c9c231..8c6bfa2 100644
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@@ -109,6 +109,12 @@
       WHERE
           patient_id in (${patientIds})
   </select>
+    <select id="selectAllInfo" resultType="com.emr.vo.commomSearch.CommomVo">
+        select
+        inpatient_no,
+        name
+        from commomtable
+    </select>
   <!--根据住院次数和病案号和姓名查询patientId-->
   <select id="selectPatientIdByAdmissTimesAndInpatientNoAndName" resultType="java.lang.String" parameterType="java.lang.String">
       SELECT
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
index b4dad53..2bc959f 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -13,6 +13,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet" />
+
     <!--[if lt IE 9]>
     <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
@@ -20,6 +22,7 @@
     <![endif]-->
     <script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
     <script type="text/javascript" src="${path}/static/js/pinying.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/js/select2.min.js"></script>
     <script>
         var path = "${path}";
     </script>
@@ -28,6 +31,9 @@
             margin-right: -15px;
             margin-bottom: -15px;
         }
+        .collapse{
+            overflow-y:scroll;
+        }
         .labelDiv{
             padding-top: 2%;
             padding-right: 0;
@@ -37,10 +43,10 @@
             padding-top: 2%;
         }
         /*搜索区域*/
-        .panel-group{
+        /*.panel-group{
             height: 254px;
             margin-bottom: 0!important;
-        }
+        }*/
         /*按钮组*/
         .btns{
             width:102%;
@@ -254,13 +260,14 @@
                                         <label class="control-label">病案号：</label>
                                     </div>
                                     <div class="col-sm-8 inputDiv">
-                                        <input type="text" class="form-control input-sm inputValue" id="inpatient_no" onkeyup="getInpatientNoContents('inpatient_no')" onfocus="getInpatientNoContents('inpatient_no')" onblur="clearContent('inpatient_no')">
-                                        <div id="inpatient_noDiv">
+                                        <select class="selectpicker form-control input-sm inputValue"  id="inpatient_no" style="max-height:400px!important;overflow:scroll;" data-live-search="true"></select>
+                                        <%--<input type="text" class="form-control input-sm inputValue" id="inpatient_no" onkeyup="getInpatientNoContents('inpatient_no')" onfocus="getInpatientNoContents('inpatient_no')" onblur="clearContent('inpatient_no')">
+                                        <div id="inpatient_noDiv" style="overflow:auto;">
                                             <table id="inpatient_noContent_table" bgcolor="#FFFAFA" border="0"
                                                    cellspacing="0" cellpadding="0">
-                                                <tbody id="inpatient_noContent"> </tbody>
+                                                <tbody id="inpatient_noContent"></tbody>
                                             </table>
-                                        </div>
+                                        </div>--%>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
index a7345bb..85612dd 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
@@ -1,3 +1,4 @@
+<%@ page import="java.util.ArrayList" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
@@ -17,6 +18,14 @@
     <![endif]-->
     <script>
         var path = "${path}";
+        var array = new Array();
+        var nameArray = new Array();
+        <c:forEach items="${relateds}" var="related">
+        array.push("${related.id}");
+        </c:forEach>
+        <c:forEach items="${relateds}" var="related">
+        nameArray.push("${related.name}");
+        </c:forEach>
     </script>
     <style type="text/css">
         body {
@@ -137,6 +146,9 @@
                 <a data-toggle="collapse" href="#b">
                     可收缩
                 </a>
+                <a data-toggle="collapse" onclick="checkCancel(array, nameArray)">
+                    取消
+                </a>
             </h5>
         </div>
         <div id="b" class="panel-collapse collapse in">
@@ -152,7 +164,7 @@
     </div>
 </div>
 <div class="bottomDiv">
-    <div class="blockDiv">
+    <div class="blockDiv" id="blockDiv">
         <form id="block">
 
         </form>
diff --git a/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js b/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
index 1ffec12..8ff2bc8 100644
--- a/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
+++ b/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
@@ -1251,6 +1251,7 @@
             '</div>',
             '<div class="pull-' + this.options.paginationHAlign + ' pagination">',
             '<ul class="pagination' + sprintf(' pagination-%s', this.options.iconSize) + '">',
+            '<li class="page-first"><a href="javascript:void(0)" rel="external nofollow" rel="external nofollow" >' + this.options.paginationFirstText + '</a></li>',
             '<li class="page-pre"><a href="javascript:void(0)" rel="external nofollow" rel="external nofollow" >' + this.options.paginationPreText + '</a></li>');
 
         if (this.totalPages < 5) {
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index 48b3cd3..ae96649 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -1,630 +1,692 @@
 $(function () {
-	//百叶窗风格
-	$('.collapse').collapse({
-		toggle: false
-	})
-	//加载表格
-	freshTable();
-	//加载时间控件1
-	initDateInput(1);
-	//加载时间控件2
-	initDateInput(2);
-	//加载性别
-	loadSex();
-	//加载科室
-	loadDept();
-	//加载转归情况
-	loadDiagStatus();
-	//加载诊断编码和诊断名称字典
-	loadDiag();
-	//加载手术字典
-	loadOperate();
+    //百叶窗风格
+    $('.collapse').collapse({
+        toggle: false
+    })
+    //加载表格
+    freshTable();
+    //加载时间控件1
+    initDateInput(1);
+    //加载时间控件2
+    initDateInput(2);
+    //加载性别
+    loadSex();
+    //加载科室
+    loadDept();
+    //加载转归情况
+    loadDiagStatus();
+    //加载诊断编码和诊断名称字典
+    loadDiag();
+    //加载手术字典
+    loadOperate();
+    //加载inpatientNo
+    loadInpatientNo();
 });
 //加载性别
-function loadSex(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/getSex',
-		dataType:'json',
-		success:function (data) {
-			if(null != data){
-				$("#sex").empty();
-				var html = '';
-				for (var i = 0; i < data.length; i++) {
-					if(i > 1){
-						html += '<div class="col-sm-3 radioDiv">'
-							 +'<input type="radio" id="'+data[i].name+'" name="sex" value="'+data[i].name+'" class="sexInput"><label class="checkBoxClass" for="'+data[i].name+'">'+data[i].name+'</label></div>';
-					}else{
-						html += '<div class="col-sm-2 radioDiv">'
-							 +'<input type="radio" id="'+data[i].name+'"  name="sex" value="'+data[i].name+'" class="sexInput"><label class="checkBoxClass" for="'+data[i].name+'">'+data[i].name+'</label></div>';
-					}
-				}
-				$("#sex").append(html);
-			}
-		}
-	})
+function loadSex() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/getSex',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data) {
+                $("#sex").empty();
+                var html = '';
+                for (var i = 0; i < data.length; i++) {
+                    if (i > 1) {
+                        html += '<div class="col-sm-3 radioDiv">'
+                            + '<input type="radio" id="' + data[i].name + '" name="sex" value="' + data[i].name + '" class="sexInput"><label class="checkBoxClass" for="' + data[i].name + '">' + data[i].name + '</label></div>';
+                    } else {
+                        html += '<div class="col-sm-2 radioDiv">'
+                            + '<input type="radio" id="' + data[i].name + '"  name="sex" value="' + data[i].name + '" class="sexInput"><label class="checkBoxClass" for="' + data[i].name + '">' + data[i].name + '</label></div>';
+                    }
+                }
+                $("#sex").append(html);
+            }
+        }
+    })
+}
+
+//加载病案号
+function loadInpatientNo() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/getCommonInfo',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data) {
+                $("#inpatient_no").empty();
+                var html = '<option value=""></option>';
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name != '' && data[i].inpatientNo != '') {
+                        var name = data[i].name;
+                        var inpatientNo = data[i].inpatientNo;
+                        /*var py = makePy(name);
+                        var pingyin = ConvertPinyin(name);*/
+                        html += '<option value="' + inpatientNo + '">' + inpatientNo + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + name + '</option>';
+                    }
+                }
+                $("#inpatient_no").append(html);
+                $("#inpatient_no").selectpicker('refresh');
+            }
+        }
+    })
 }
 
 //加载科室
-function loadDept(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/getDept',
-		dataType:'json',
-		success:function (data) {
-			if(null != data){
-				$("#dis_dept").empty();
-				var html = '<option value=""></option>';
-				for (var i = 0; i < data.length; i++) {
-					if(data[i].name != ''){
-						var name = data[i].name;
-						var py = makePy(name);
-						var pingyin = ConvertPinyin(name);
-						html += '<option data-tokens="'+name+'|'+py[0]+'|'+pingyin+'" value="'+name+'">'+name+'</option>';
-					}
-				}
-				$("#dis_dept").append(html);
-				$("#dis_dept").selectpicker('refresh');
-			}
-		}
-	})
+function loadDept() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/getDept',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data) {
+                $("#dis_dept").empty();
+                var html = '<option value=""></option>';
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].name != '') {
+                        var name = data[i].name;
+                        var py = makePy(name);
+                        var pingyin = ConvertPinyin(name);
+                        html += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '">' + name + '</option>';
+                    }
+                }
+                $("#dis_dept").append(html);
+                $("#dis_dept").selectpicker('refresh');
+            }
+        }
+    })
 }
 
 //加载转归情况
-function loadDiagStatus(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/getDiagStatus',
-		dataType:'json',
-		success:function (data) {
-			if(null != data){
-				$("#dis_thing").empty();
-				var html = '<option value="">全部</option>';
-				for (var i = 0; i < data.length; i++) {
-					if(data[i].code != '0'){
-						html += '<option value="'+data[i].name+'">'+data[i].name+'</option>';
-					}
-				}
-				$("#dis_thing").append(html);
-			}
-		}
-	})
+function loadDiagStatus() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/getDiagStatus',
+        dataType: 'json',
+        success: function (data) {
+            if (null != data) {
+                $("#dis_thing").empty();
+                var html = '<option value="">全部</option>';
+                for (var i = 0; i < data.length; i++) {
+                    if (data[i].code != '0') {
+                        html += '<option value="' + data[i].name + '">' + data[i].name + '</option>';
+                    }
+                }
+                $("#dis_thing").append(html);
+            }
+        }
+    })
 }
+
 //加载诊断编码和诊断名称
-function loadDiag(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/getIcdCodeList',
-		dataType:'json',
-		success:function(data){
-			$("#diag_code").empty();
-			$("#diag_name").empty();
-			if(data != null){
-				var codeHtml = '<option value=""></option>';
-				var nameHtml = '<option value=""></option>';
-				for (var i = 0; i < data.length; i++) {
-					codeHtml += '<option value='+data[i].code+'>'+data[i].code+'</option>';
-					if(data[i].name != ''){
-						var name = data[i].name;
-						var py = makePy(name);
-						var pingyin = ConvertPinyin(name);
-						nameHtml += '<option data-tokens="'+name+'|'+py[0]+'|'+pingyin+'" value="'+name+'">'+name+'</option>';
-					}
-				}
-				$("#diag_code").append(codeHtml);
-				$("#diag_code").selectpicker('refresh');
-				$("#diag_name").append(nameHtml);
-				$("#diag_name").selectpicker('refresh');
-			}
-		}
-	})
+function loadDiag() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/getIcdCodeList',
+        dataType: 'json',
+        success: function (data) {
+            $("#diag_code").empty();
+            $("#diag_name").empty();
+            if (data != null) {
+                var codeHtml = '<option value=""></option>';
+                var nameHtml = '<option value=""></option>';
+                for (var i = 0; i < data.length; i++) {
+                    codeHtml += '<option value=' + data[i].code + '>' + data[i].code + '</option>';
+                    if (data[i].name != '') {
+                        var name = data[i].name;
+                        var py = makePy(name);
+                        var pingyin = ConvertPinyin(name);
+                        nameHtml += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '">' + name + '</option>';
+                    }
+                }
+                $("#diag_code").append(codeHtml);
+                $("#diag_code").selectpicker('refresh');
+                $("#diag_name").append(nameHtml);
+                $("#diag_name").selectpicker('refresh');
+            }
+        }
+    })
 }
+
 //加载手术字典
-function loadOperate(){
-	$.ajax({
-		type:'get',
-		url:path+'/commom/loadCM3',
-		dataType:'json',
-		success:function(data){
-			$("#operate_code").empty();
-			$("#operate_name").empty();
-			if(data != null){
-				var codeHtml = '<option value=""></option>';
-				var nameHtml = '<option value=""></option>';
-				for (var i = 0; i < data.length; i++) {
-					codeHtml += '<option value='+data[i].code+'>'+data[i].code+'</option>';
-					if(data[i].name != ''){
-						var name = data[i].name;
-						var py = makePy(name);
-						var pingyin = ConvertPinyin(name);
-						nameHtml += '<option data-tokens="'+name+'|'+py[0]+'|'+pingyin+'" value="'+name+'">'+name+'</option>';
-					}
-				}
-				$("#operate_code").append(codeHtml);
-				$("#operate_code").selectpicker('refresh');
-				$("#operate_name").append(nameHtml);
-				$("#operate_name").selectpicker('refresh');
-			}
-		}
-	})
+function loadOperate() {
+    $.ajax({
+        type: 'get',
+        url: path + '/commom/loadCM3',
+        dataType: 'json',
+        success: function (data) {
+            $("#operate_code").empty();
+            $("#operate_name").empty();
+            if (data != null) {
+                var codeHtml = '<option value=""></option>';
+                var nameHtml = '<option value=""></option>';
+                for (var i = 0; i < data.length; i++) {
+                    codeHtml += '<option value=' + data[i].code + '>' + data[i].code + '</option>';
+                    if (data[i].name != '') {
+                        var name = data[i].name;
+                        var py = makePy(name);
+                        var pingyin = ConvertPinyin(name);
+                        nameHtml += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '">' + name + '</option>';
+                    }
+                }
+                $("#operate_code").append(codeHtml);
+                $("#operate_code").selectpicker('refresh');
+                $("#operate_name").append(nameHtml);
+                $("#operate_name").selectpicker('refresh');
+            }
+        }
+    })
 }
 
 //动态控制限手术的值
 $("#isOper").change(function () {
-	var checked = $(this).is(':checked');
-	if(checked){
-		$(this).val(1)
-	}else{
-		$(this).val("");
-	}
+    var checked = $(this).is(':checked');
+    if (checked) {
+        $(this).val(1)
+    } else {
+        $(this).val("");
+    }
 })
 //时间格式属性名集合
 var commomtable = 'commomtable';
+
 //拼接sql
-function getSql(){
-	var inputValue = getInputValue();
-	if(inputValue != ''){
-		//select语句字符串
-		var selectNames = '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,';
-		selectNames += $("#englishFields").val();
-		//from语句字符串
-		var fromTableNames = ' from ';
-		//where语句字符串
-		var whereNames = ' where ';
-		//判断是否多表
-		var tables = false;
-		$('.otherTable').each(function () {
-			if($(this).val() != ''){
-				tables = true;
-				return false;
-			}
-		})
-		//单表
-		fromTableNames += commomtable;
-		//拼接where语句
-		var name = '';
-		//姓名
-		var searchName = $("#name").val();
-		if(searchName != ''){
-			name = 'name';
-			//去除前后空格
-			searchName = searchName.replace(/(^\s*)|(\s*$)/g, "");
-			var pinyin = /^[a-zA-Z]+$/;
-			//1.逗号隔开
-			if(searchName.indexOf(",")!=-1 || searchName.indexOf("，")!=-1){
-				if(searchName.indexOf(",")!=-1){
-					searchName = searchName.split(",");
-				}else if(searchName.indexOf("，")!=-1){
-					searchName = searchName.split("，");
-				}
-				for (var i = 0; i < searchName.length; i++) {
-					if(searchName[i] != ''){
-						//拼接前括号
-						if(i == 0){
-							whereNames += "(";
-						}
-						if(i != searchName.length-1){
-							if(searchName[i].indexOf("*")!=-1){
-								//2.带*号
-                                searchName = searchName.replace(/\*/g,"_");
-								whereNames += commomtable+"."+name+" LIKE '"+searchName[i]+"' OR ";
-							}else if(pinyin.test(searchName[i])) {
-								//3.拼音缩写
-								whereNames += commomtable+".name_cym LIKE '%"+searchName[i]+"%' OR ";
-							}else{
-								whereNames += commomtable+"."+name+" LIKE '%"+searchName[i]+"%' OR ";
-							}
-						}else{
-							if(searchName[i].indexOf("*")!=-1){
-								//2.带*号
-                                searchName = searchName.replace(/\*/g,"_");
-								whereNames += commomtable+"."+name+" LIKE '"+searchName[i]+"')";
-							}else if(pinyin.test(searchName[i])) {
-								//3.拼音缩写
-								whereNames += commomtable+".name_cym LIKE '%"+searchName[i]+"%')";
-							}else{
-								whereNames += commomtable+"."+name+" LIKE '%"+searchName[i]+"%')";
-							}
-						}
-					}
-				}
-				whereNames += " AND ";
-			}else if(searchName.indexOf("*")!=-1){
-				//2.带*号
-				searchName = searchName.replace(/\*/g,"_");
-				whereNames += commomtable+"."+name+" LIKE '"+searchName+"' AND ";
-			}else if(pinyin.test(searchName)) {
-				//3.拼音缩写
-				whereNames += commomtable+".name_cym LIKE '%"+searchName+"%' AND ";
-			}else{
-				whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-			}
-		}
-		//年龄
-		if($("#age1").val() != '' && $("#age2").val() != ''){
-			var ageType = $("#ageType").val();
-			if(ageType == '1'){
-				name = 'age';
-				if($("#age1").val() < $("#age2").val()){
-					whereNames += "(" + commomtable+"."+name+" BETWEEN "+$("#age1").val()+" AND "+($("#age2").val()-1)+" or (" + commomtable+"."+name+"="+$("#age2").val()+" and "+commomtable+".age_month=0 and "+commomtable+".age_day=0)) AND ";
-				}else if($("#age2").val() < $("#age1").val()){
-					whereNames += "(" + commomtable+"."+name+" BETWEEN "+$("#age2").val()+" AND "+($("#age1").val()-1)+" or (" + commomtable+"."+name+"="+$("#age1").val()+" and "+commomtable+".age_month=0 and "+commomtable+".age_day=0)) AND ";
-				}
-			}else if(ageType == '2'){
-				//周
-				name = 'age_month';
-				if($("#age1").val() < $("#age2").val()){
-					whereNames += "(" + 'age = 0 AND '+ commomtable+"."+name+" BETWEEN "+$("#age1").val()+" AND "+($("#age2").val()-1)+" OR ("+commomtable+".age = 0 AND "+commomtable+".age_month = "+$("#age2").val()+" AND "+commomtable+".age_day = 0)) AND ";
-				}else if($("#age2").val() < $("#age1").val()){
-					whereNames += "(" + 'age = 0 AND '+ commomtable+"."+name+" BETWEEN "+$("#age2").val()+" AND "+($("#age1").val()-1)+" OR ("+commomtable+".age = 0 AND "+commomtable+".age_month = "+$("#age1").val()+" AND "+commomtable+".age_day = 0)) AND ";
-				}
-			}else if(ageType == '3'){
-				//天
-				name = 'age_day';
-				if($("#age1").val() < $("#age2").val()){
-					whereNames += commomtable+"."+name+" BETWEEN "+$("#age1").val()+" AND "+$("#age2").val()+" AND ";
-				}else if($("#age2").val() < $("#age1").val()){
-					whereNames += commomtable+"."+name+" BETWEEN "+$("#age2").val()+" AND "+$("#age1").val()+" AND ";
-				}
-				whereNames += 'age = 0 AND age_month = 0 AND ';
-			}
-		}
-		//性别
-		var sex = $("input[name='sex']:checked").val();
-		if(sex != ''){
-			name = 'sex';
-			whereNames += commomtable+"."+name+" = '"+sex+"' AND ";
-		}
-		//病案号
-		var inpatientNo = $("#inpatient_no").val();
-		if(inpatientNo != ''){
-			name = 'inpatient_no';
-			inpatientNo = inpatientNo.replace(/(^\s*)|(\s*$)/g, "");
-			//1.逗号隔开
-			if(inpatientNo.indexOf(",")!=-1 || inpatientNo.indexOf("，")!=-1){
-				if(inpatientNo.indexOf(",")!=-1){
-					inpatientNo = inpatientNo.split(",");
-				}else if(inpatientNo.indexOf("，")!=-1){
-					inpatientNo = inpatientNo.split("，");
-				}
-				for (var i = 0; i < inpatientNo.length; i++) {
-					if(inpatientNo[i] != ''){
+function getSql() {
+    var inputValue = getInputValue();
+    if (inputValue != '') {
+        //select语句字符串
+        var selectNames = '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,';
+        selectNames += $("#englishFields").val();
+        //from语句字符串
+        var fromTableNames = ' from ';
+        //where语句字符串
+        var whereNames = ' where ';
+        //判断是否多表
+        var tables = false;
+        $('.otherTable').each(function () {
+            if ($(this).val() != '') {
+                tables = true;
+                return false;
+            }
+        })
+        //单表
+        fromTableNames += commomtable;
+        //拼接where语句
+        var name = '';
+        //姓名
+        var searchName = $("#name").val();
+        if (searchName != '') {
+            name = 'name';
+            //去除前后空格
+            searchName = searchName.replace(/(^\s*)|(\s*$)/g, "");
+            var pinyin = /^[a-zA-Z]+$/;
+            //1.逗号隔开
+            if (searchName.indexOf(",") != -1 || searchName.indexOf("，") != -1) {
+                if (searchName.indexOf(",") != -1) {
+                    searchName = searchName.split(",");
+                } else if (searchName.indexOf("，") != -1) {
+                    searchName = searchName.split("，");
+                }
+                for (var i = 0; i < searchName.length; i++) {
+                    if (searchName[i] != '') {
+                        //拼接前括号
+                        if (i == 0) {
+                            whereNames += "(";
+                        }
+                        if (i != searchName.length - 1) {
+                            if (searchName[i].indexOf("*") != -1) {
+                                //2.带*号
+                                searchName = searchName.replace(/\*/g, "_");
+                                whereNames += commomtable + "." + name + " LIKE '" + searchName[i] + "' OR ";
+                            } else if (pinyin.test(searchName[i])) {
+                                //3.拼音缩写
+                                whereNames += commomtable + ".name_cym LIKE '%" + searchName[i] + "%' OR ";
+                            } else {
+                                whereNames += commomtable + "." + name + " LIKE '%" + searchName[i] + "%' OR ";
+                            }
+                        } else {
+                            if (searchName[i].indexOf("*") != -1) {
+                                //2.带*号
+                                searchName = searchName.replace(/\*/g, "_");
+                                whereNames += commomtable + "." + name + " LIKE '" + searchName[i] + "')";
+                            } else if (pinyin.test(searchName[i])) {
+                                //3.拼音缩写
+                                whereNames += commomtable + ".name_cym LIKE '%" + searchName[i] + "%')";
+                            } else {
+                                whereNames += commomtable + "." + name + " LIKE '%" + searchName[i] + "%')";
+                            }
+                        }
+                    }
+                }
+                whereNames += " AND ";
+            } else if (searchName.indexOf("*") != -1) {
+                //2.带*号
+                searchName = searchName.replace(/\*/g, "_");
+                whereNames += commomtable + "." + name + " LIKE '" + searchName + "' AND ";
+            } else if (pinyin.test(searchName)) {
+                //3.拼音缩写
+                whereNames += commomtable + ".name_cym LIKE '%" + searchName + "%' AND ";
+            } else {
+                whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+            }
+        }
+        //年龄
+        if ($("#age1").val() != '' && $("#age2").val() != '') {
+            var ageType = $("#ageType").val();
+            if (ageType == '1') {
+                name = 'age';
+                if ($("#age1").val() < $("#age2").val()) {
+                    whereNames += "(" + commomtable + "." + name + " BETWEEN " + $("#age1").val() + " AND " + ($("#age2").val() - 1) + " or (" + commomtable + "." + name + "=" + $("#age2").val() + " and " + commomtable + ".age_month=0 and " + commomtable + ".age_day=0)) AND ";
+                } else if ($("#age2").val() < $("#age1").val()) {
+                    whereNames += "(" + commomtable + "." + name + " BETWEEN " + $("#age2").val() + " AND " + ($("#age1").val() - 1) + " or (" + commomtable + "." + name + "=" + $("#age1").val() + " and " + commomtable + ".age_month=0 and " + commomtable + ".age_day=0)) AND ";
+                }
+            } else if (ageType == '2') {
+                //周
+                name = 'age_month';
+                if ($("#age1").val() < $("#age2").val()) {
+                    whereNames += "(" + 'age = 0 AND ' + commomtable + "." + name + " BETWEEN " + $("#age1").val() + " AND " + ($("#age2").val() - 1) + " OR (" + commomtable + ".age = 0 AND " + commomtable + ".age_month = " + $("#age2").val() + " AND " + commomtable + ".age_day = 0)) AND ";
+                } else if ($("#age2").val() < $("#age1").val()) {
+                    whereNames += "(" + 'age = 0 AND ' + commomtable + "." + name + " BETWEEN " + $("#age2").val() + " AND " + ($("#age1").val() - 1) + " OR (" + commomtable + ".age = 0 AND " + commomtable + ".age_month = " + $("#age1").val() + " AND " + commomtable + ".age_day = 0)) AND ";
+                }
+            } else if (ageType == '3') {
+                //天
+                name = 'age_day';
+                if ($("#age1").val() < $("#age2").val()) {
+                    whereNames += commomtable + "." + name + " BETWEEN " + $("#age1").val() + " AND " + $("#age2").val() + " AND ";
+                } else if ($("#age2").val() < $("#age1").val()) {
+                    whereNames += commomtable + "." + name + " BETWEEN " + $("#age2").val() + " AND " + $("#age1").val() + " AND ";
+                }
+                whereNames += 'age = 0 AND age_month = 0 AND ';
+            }
+        }
+        //性别
+        var sex = $("input[name='sex']:checked").val();
+        if (sex != '') {
+            name = 'sex';
+            whereNames += commomtable + "." + name + " = '" + sex + "' AND ";
+        }
+        //病案号
+        var inpatientNo = $("#inpatient_no").val();
+        if (inpatientNo != '') {
+            name = 'inpatient_no';
+            inpatientNo = inpatientNo.replace(/(^\s*)|(\s*$)/g, "");
+            //1.逗号隔开
+            if (inpatientNo.indexOf(",") != -1 || inpatientNo.indexOf("，") != -1) {
+                if (inpatientNo.indexOf(",") != -1) {
+                    inpatientNo = inpatientNo.split(",");
+                } else if (inpatientNo.indexOf("，") != -1) {
+                    inpatientNo = inpatientNo.split("，");
+                }
+                for (var i = 0; i < inpatientNo.length; i++) {
+                    if (inpatientNo[i] != '') {
                         inpatientNo[i] = inpatientNo[i].replace(/(^\s*)|(\s*$)/g, "");
-						//拼接前括号
-						if(i == 0){
-							whereNames += "(";
-						}
-						if(i != inpatientNo.length-1){
-							whereNames += commomtable+"."+name+" LIKE '%"+inpatientNo[i]+"%' OR ";
-						}else{
-							whereNames += commomtable+"."+name+" LIKE '%"+inpatientNo[i]+"%')";
-						}
-					}
-				}
-				whereNames += " AND ";
-			}else{
-				whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-			}
-		}
-		//ID号
-        if($("#admiss_id").val() != ''){
+                        //拼接前括号
+                        if (i == 0) {
+                            whereNames += "(";
+                        }
+                        if (i != inpatientNo.length - 1) {
+                            whereNames += commomtable + "." + name + " LIKE '%" + inpatientNo[i] + "%' OR ";
+                        } else {
+                            whereNames += commomtable + "." + name + " LIKE '%" + inpatientNo[i] + "%')";
+                        }
+                    }
+                }
+                whereNames += " AND ";
+            } else {
+                whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+            }
+        }
+        //ID号
+        if ($("#admiss_id").val() != '') {
             name = 'admiss_id';
-            whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
+            whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+        }
+        //出院科室
+        var disDept = $("#dis_dept").val();
+        if (disDept != '' && disDept != null && disDept != 'null') {
+            var disDepts = "";
+            for (var i = 0; i < disDept.length; i++) {
+                if (disDept[i] != '') {
+                    disDepts += "'" + disDept[i] + "',";
+                }
+            }
+            disDepts = disDepts.substring(0, disDepts.length - 1);
+            name = 'dis_dept';
+            whereNames += commomtable + "." + name + " IN (" + disDepts + ") AND ";
+        }
+        //病状转归
+        if ($("#dis_thing").val() != '') {
+            name = 'main_dis_thing';
+            whereNames += commomtable + "." + name + " = '" + $("#dis_thing").val() + "' AND ";
+        }
+        //入院日期
+        if ($("#startTime1").val() != '' && $("#endTime1").val() != '') {
+            name = 'admiss_date';
+            whereNames += commomtable + "." + name + " BETWEEN '" + $("#startTime1").val() + " 00:00:00' AND '" + $("#endTime1").val() + " 23:59:59' AND ";
+        }
+        //出院日期
+        if ($("#startTime2").val() != '' && $("#endTime2").val() != '') {
+            name = 'dis_date';
+            whereNames += commomtable + "." + name + " BETWEEN '" + $("#startTime2").val() + " 00:00:00' AND '" + $("#endTime2").val() + " 23:59:59' AND ";
+        }
+        //诊断名称
+        if ($("#diag_name").val() != '') {
+            name = 'main_diag_name';
+            whereNames += commomtable + "." + name + " LIKE '%" + $("#diag_name").val() + "%' AND ";
+        }
+        //诊断表
+        //诊断码
+        if ($("#diag_code").val() != '') {
+            name = 'main_diag_code';
+            whereNames += commomtable + "." + name + " LIKE '%" + $("#diag_code").val() + "%' AND ";
+        }
+        /*//病理诊断
+        if($("#pathology_name").val() != ''){
+            name = 'diag_name';
+            whereNames += "t_diag.diag_type='3' AND t_diag."+name+" LIKE '%"+$("#pathology_name").val()+"%' AND ";
         }
-		//出院科室
-		var disDept = $("#dis_dept").val();
-		if(disDept != '' && disDept != null && disDept != 'null'){
-			var disDepts = "";
-			for (var i = 0; i < disDept.length; i++) {
-				if(disDept[i] != ''){
-					disDepts+="'"+disDept[i]+"',";
-				}
-			}
-			disDepts = disDepts.substring(0,disDepts.length-1);
-			name = 'dis_dept';
-			whereNames += commomtable+"."+name+" IN ("+disDepts+") AND ";
-		}
-		//病状转归
-		if($("#dis_thing").val() != ''){
-			name = 'main_dis_thing';
-			whereNames += commomtable+"."+name+" = '"+$("#dis_thing").val()+"' AND ";
-		}
-		//入院日期
-		if($("#startTime1").val() != '' && $("#endTime1").val() != ''){
-			name = 'admiss_date';
-			whereNames += commomtable+"."+name+" BETWEEN '"+$("#startTime1").val()+" 00:00:00' AND '"+$("#endTime1").val()+" 23:59:59' AND ";
-		}
-		//出院日期
-		if($("#startTime2").val() != '' && $("#endTime2").val() != ''){
-			name = 'dis_date';
-			whereNames += commomtable+"."+name+" BETWEEN '"+$("#startTime2").val()+" 00:00:00' AND '"+$("#endTime2").val()+" 23:59:59' AND ";
-		}
-		//诊断名称
-		if($("#diag_name").val() != ''){
-			name = 'main_diag_name';
-			whereNames += commomtable+"."+name+" LIKE '%"+$("#diag_name").val()+"%' AND ";
-		}
-		//诊断表
-		//诊断码
-		if($("#diag_code").val() != ''){
-			name = 'main_diag_code';
-			whereNames += commomtable+"."+name+" LIKE '%"+$("#diag_code").val()+"%' AND ";
-		}
-		/*//病理诊断
-		if($("#pathology_name").val() != ''){
-			name = 'diag_name';
-			whereNames += "t_diag.diag_type='3' AND t_diag."+name+" LIKE '%"+$("#pathology_name").val()+"%' AND ";
-		}
-		//伴随诊断
-		if($("#follow_name").val() != ''){
-			name = 'follow_name';
-			whereNames += "t_diag.diag_type>'1' AND t_diag.diag_name LIKE '%"+$("#"+name).val()+"%' AND ";
-		}*/
-		//手术表
-		//手术编号
-		if($("#operate_code").val() != ''){
-			name = 'operate_code';
-			whereNames += "t_operate."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-		}
-		//手术名称
-		if($("#operate_name").val() != ''){
-			name = 'operate_name';
-			whereNames += "t_operate."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-		}
-		var userName = "'" +$("#userId").val()+ "'";
-		fromTableNames += ' left join emr_apply_approve on ' + commomtable + '.patient_id = emr_apply_approve.patient_id \n' +
-			'and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = '+ userName +' and emr_apply_approve.apply_type != 3 ' +
-			' left join emr_apply_approve emr_apply_approve1 on ' + commomtable + '.patient_id = emr_apply_approve1.patient_id \n' +
-		'and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = '+ userName +' and emr_apply_approve1.apply_type = 3'+
-			' left join emr_lock on ' + commomtable + '.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1';
-		//拼接诊断表
-		/*var diagFlag = false;
-		var otherTable = "";
-		$(".diagTable").each(function () {
-			if($(this).val() != ''){
-				diagFlag = true;
-				return false;
-			}
-		})
-		if(diagFlag){
-			otherTable = 't_diag';
-			fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id';
-		}*/
-		//拼接手术表
-		var operFlag = false;
-		$(".operTable").each(function () {
-			if($(this).val() != '' && $(this).val() != 'on'){
-				operFlag = true;
-				return false;
-			}
-		})
-		if(operFlag){
-			otherTable = 't_operate';
-			fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id';
-		}
-		//拼接主治医生
-		if($("#attending").val() != ''){
-			name = 'attending';
-			whereNames += commomtable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-		}
-		//限手术
-		var isOper = $("#isOper").val();
-		if(isOper != '' && isOper == 1){
-			name = 'is_oper';
-			whereNames += commomtable+"."+name+" = '有' AND ";
-		}
-		//拼接院内感染表
-		/*var taint_name = $("#taint_name").val();
-		if(taint_name != ''){
-			otherTable = 't_taint';
-			fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id';
-			name = 'taint_name';
-			whereNames += otherTable+".taint_type='1' AND "+otherTable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
-		}*/
-		if(whereNames != ' where '){
-			whereNames = whereNames.substring(0,whereNames.length - 4);
-			var orderBys = " ORDER BY "+commomtable+".inpatient_no,"+commomtable+".admiss_times";
-			var sql =  selectNames + fromTableNames + whereNames;
-			$("#sql").val(sql);
-			$("#orderBys").val(orderBys);
-		}
-		//console.log(sql);
-	}else{
-		$("#sql").val("");
-	}
+        //伴随诊断
+        if($("#follow_name").val() != ''){
+            name = 'follow_name';
+            whereNames += "t_diag.diag_type>'1' AND t_diag.diag_name LIKE '%"+$("#"+name).val()+"%' AND ";
+        }*/
+        //手术表
+        //手术编号
+        if ($("#operate_code").val() != '') {
+            name = 'operate_code';
+            whereNames += "t_operate." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+        }
+        //手术名称
+        if ($("#operate_name").val() != '') {
+            name = 'operate_name';
+            whereNames += "t_operate." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+        }
+        var userName = "'" + $("#userId").val() + "'";
+        fromTableNames += ' left join emr_apply_approve on ' + commomtable + '.patient_id = emr_apply_approve.patient_id \n' +
+            'and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = ' + userName + ' and emr_apply_approve.apply_type != 3 ' +
+            ' left join emr_apply_approve emr_apply_approve1 on ' + commomtable + '.patient_id = emr_apply_approve1.patient_id \n' +
+            'and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = ' + userName + ' and emr_apply_approve1.apply_type = 3' +
+            ' left join emr_lock on ' + commomtable + '.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1';
+        //拼接诊断表
+        /*var diagFlag = false;
+        var otherTable = "";
+        $(".diagTable").each(function () {
+            if($(this).val() != ''){
+                diagFlag = true;
+                return false;
+            }
+        })
+        if(diagFlag){
+            otherTable = 't_diag';
+            fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id';
+        }*/
+        //拼接手术表
+        var operFlag = false;
+        $(".operTable").each(function () {
+            if ($(this).val() != '' && $(this).val() != 'on') {
+                operFlag = true;
+                return false;
+            }
+        })
+        if (operFlag) {
+            otherTable = 't_operate';
+            fromTableNames += ' left join ' + otherTable + ' on ' + commomtable + '.patient_id=' + otherTable + '.patient_id';
+        }
+        //拼接主治医生
+        if ($("#attending").val() != '') {
+            name = 'attending';
+            whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+        }
+        //限手术
+        var isOper = $("#isOper").val();
+        if (isOper != '' && isOper == 1) {
+            name = 'is_oper';
+            whereNames += commomtable + "." + name + " = '有' AND ";
+        }
+        //拼接院内感染表
+        /*var taint_name = $("#taint_name").val();
+        if(taint_name != ''){
+            otherTable = 't_taint';
+            fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id';
+            name = 'taint_name';
+            whereNames += otherTable+".taint_type='1' AND "+otherTable+"."+name+" LIKE '%"+$("#"+name).val()+"%' AND ";
+        }*/
+        if (whereNames != ' where ') {
+            whereNames = whereNames.substring(0, whereNames.length - 4);
+            var orderBys = " ORDER BY " + commomtable + ".inpatient_no," + commomtable + ".admiss_times";
+            var sql = selectNames + fromTableNames + whereNames;
+            $("#sql").val(sql);
+            $("#orderBys").val(orderBys);
+        }
+        //console.log(sql);
+    } else {
+        $("#sql").val("");
+    }
 }
+
 //搜索功能
 function search() {
     var inpatient_no = $("#inpatient_no").val();
-    if(inpatient_no != '' && (inpatient_no.indexOf(",")==-1 || inpatient_no.indexOf("，")==-1) && inpatient_no.length > 16){
+    var startTime1 = $("#startTime1").val();
+    var endTime1 = $("#endTime1").val();
+    var startTime2 = $("#startTime2").val();
+    var endTime2 = $("#endTime2").val();
+    var age1 = $("#age1").val();
+    var age2 = $("#age2").val();
+    console.log("1111" + startTime1 + endTime1 + startTime2 + endTime2);
+    if (inpatient_no != '' && (inpatient_no.indexOf(",") == -1 || inpatient_no.indexOf("，") == -1) && inpatient_no.length > 16) {
         toastr.warning("病案号的长度太长!");
         return false;
     }
-	getSql();
-	freshTable();
+    if ((age1 != '' && age2 == '') || (age1 == '' && age2 != '')) {
+        toastr.warning("请输入完整年龄时间段!");
+        return false;
+    }
+    if ((startTime1 != '' && endTime1 == '') || (startTime1 == '' && endTime1 != '')) {
+        toastr.warning("请输入完整的入院日期时间段!");
+        return false;
+    }
+    if ((startTime2 != '' && endTime2 == '') || (startTime2 == '' && endTime2 != '')) {
+        toastr.warning("请输入完整的出院日期时间段!");
+        return false;
+    }
+    getSql();
+    freshTable();
 }
+
 //查看详情
-function showDetail(patientId){
-	//隐藏模板选项
-	//window.location.href=path+"/commom/showRecord?patientId="+patientId;
+function showDetail(patientId) {
+    //隐藏模板选项
+    //window.location.href=path+"/commom/showRecord?patientId="+patientId;
 }
+
 //导出excel功能
-function exportExcel(){
-	getChecked();
-	//var isInputValue = getInputValue();
-	   var checks = $("#checks").val();
-	/*if(isInputValue == '' && checks == ''){
-		toastr.warning("请至少选择一个!")
-	}else{
-		*/
-		if($("#rows").val() > 5000 && checks == ''){
-			toastr.warning("数据量大,暂提供5000条以内数据导出!");
-		}else {
-			getSql();
-			var userName = "'" + $("#userName").val() + "'";
-			var sql = $("#sql").val();
-			if(sql == ''){
-				sql = initSql;
-			}
-			var reg = new RegExp("%", "g");//g,表示全部替换。
-			sql = sql.replace(reg, '%25');
-			var tableThNames = $("#tableThNames").val();
-			var fieldCns = $("#fieldCns").val();
-			var orderBys = $("#orderBys").val();
-			if (checks != '') {
-				//按选择框选择导出
-				checks = checks.substring(0, checks.length - 1);
-				var isInputValue = getInputValue();
-				if(isInputValue == ''){
-					sql += ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')';
-				}else{
-					sql += ' AND ' + commomtable + '.patient_id IN (' + checks + ')';
-				}
-				sql += orderBys;
-				var url = path + "/template/exportExcel";
-				post(url, {"sql": sql, "tableThNames": tableThNames, "fieldCns": fieldCns});
-			} else {
-				Common.confirm({
-					title: "提示",
-					message: "没有选中，您确定要按搜索栏条件导出?",
-					operate: function (reselt) {
-						if (reselt) {
-							//sql += orderBys;
-							var url = path + "/template/exportExcel";
-							post(url, {"sql": sql, "tableThNames": tableThNames, "fieldCns": fieldCns});
-						}
-					}
-				})
-			}
-		}
-	/*}*/
+function exportExcel() {
+    getChecked();
+    //var isInputValue = getInputValue();
+    var checks = $("#checks").val();
+    /*if(isInputValue == '' && checks == ''){
+        toastr.warning("请至少选择一个!")
+    }else{
+        */
+    if ($("#rows").val() > 5000 && checks == '') {
+        toastr.warning("数据量大,暂提供5000条以内数据导出!");
+    } else {
+        getSql();
+        var userName = "'" + $("#userName").val() + "'";
+        var sql = $("#sql").val();
+        if (sql == '') {
+            sql = initSql;
+        }
+        var reg = new RegExp("%", "g");//g,表示全部替换。
+        sql = sql.replace(reg, '%25');
+        var tableThNames = $("#tableThNames").val();
+        var fieldCns = $("#fieldCns").val();
+        var orderBys = $("#orderBys").val();
+        if (checks != '') {
+            //按选择框选择导出
+            checks = checks.substring(0, checks.length - 1);
+            var isInputValue = getInputValue();
+            if (isInputValue == '') {
+                sql += ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')';
+            } else {
+                sql += ' AND ' + commomtable + '.patient_id IN (' + checks + ')';
+            }
+            sql += orderBys;
+            var url = path + "/template/exportExcel";
+            post(url, {"sql": sql, "tableThNames": tableThNames, "fieldCns": fieldCns});
+        } else {
+            Common.confirm({
+                title: "提示",
+                message: "没有选中，您确定要按搜索栏条件导出?",
+                operate: function (reselt) {
+                    if (reselt) {
+                        //sql += orderBys;
+                        var url = path + "/template/exportExcel";
+                        post(url, {"sql": sql, "tableThNames": tableThNames, "fieldCns": fieldCns});
+                    }
+                }
+            })
+        }
+    }
+    /*}*/
 }
+
 /*****************************************输入框边输入内容边搜索功能方法*************************************************/
 //级联病案号，且长度超过4个字节才查询
 function getInpatientNoContents(id) {
-	var keyword = document.getElementById(id).value;
-	if (keyword.length > 4) {
-		var ajax = new XMLHttpRequest();
-		var url = path+"/approve/getInpatientNosByName?inpatientNo=" + keyword;
-		ajax.open("GET", url, true);
-		ajax.send(null);
-		ajax.onreadystatechange = function() {
-			if (ajax.readyState == 4) {
-				if (ajax.status == 200) {
-					var result = ajax.responseText;
-					insertContent(result,id);
-				}
-			}
-		}
-	} else {
-		clearContent(id);
-		return;
-	}
+    var keyword = document.getElementById(id).value;
+    if (keyword.length > 4) {
+        var ajax = new XMLHttpRequest();
+        var url = path + "/approve/getInpatientNosByName?inpatientNo=" + keyword;
+        ajax.open("GET", url, true);
+        ajax.send(null);
+        ajax.onreadystatechange = function () {
+            if (ajax.readyState == 4) {
+                if (ajax.status == 200) {
+                    var result = ajax.responseText;
+                    insertContent(result, id);
+                }
+            }
+        }
+    } else {
+        clearContent(id);
+        return;
+    }
 }
+
 //级联诊断码
 function getDiagCodeContents(id) {
-	var keyword = document.getElementById(id).value;
-	if (keyword.length > 2) {
-		var ajax = new XMLHttpRequest();
-		var url = path+"/commom/getDiagCodeContents?code=" + keyword;
-		ajax.open("GET", url, true);
-		ajax.send(null);
-		ajax.onreadystatechange = function() {
-			if (ajax.readyState == 4) {
-				if (ajax.status == 200) {
-					var result = ajax.responseText;
-					insertContent(result,id);
-				}
-			}
-		}
-	} else {
-		clearContent(id);
-		return;
-	}
+    var keyword = document.getElementById(id).value;
+    if (keyword.length > 2) {
+        var ajax = new XMLHttpRequest();
+        var url = path + "/commom/getDiagCodeContents?code=" + keyword;
+        ajax.open("GET", url, true);
+        ajax.send(null);
+        ajax.onreadystatechange = function () {
+            if (ajax.readyState == 4) {
+                if (ajax.status == 200) {
+                    var result = ajax.responseText;
+                    insertContent(result, id);
+                }
+            }
+        }
+    } else {
+        clearContent(id);
+        return;
+    }
 }
+
 //级联手术编码
 function getOperateCodeContents(id) {
-	var keyword = document.getElementById(id).value;
-	if (keyword.length > 2) {
-		var ajax = new XMLHttpRequest();
-		var url = path+"/commom/getOperateCodeContents?code=" + keyword;
-		ajax.open("GET", url, true);
-		ajax.send(null);
-		ajax.onreadystatechange = function() {
-			if (ajax.readyState == 4) {
-				if (ajax.status == 200) {
-					var result = ajax.responseText;
-					insertContent(result,id);
-				}
-			}
-		}
-	} else {
-		clearContent(id);
-		return;
-	}
+    var keyword = document.getElementById(id).value;
+    if (keyword.length > 2) {
+        var ajax = new XMLHttpRequest();
+        var url = path + "/commom/getOperateCodeContents?code=" + keyword;
+        ajax.open("GET", url, true);
+        ajax.send(null);
+        ajax.onreadystatechange = function () {
+            if (ajax.readyState == 4) {
+                if (ajax.status == 200) {
+                    var result = ajax.responseText;
+                    insertContent(result, id);
+                }
+            }
+        }
+    } else {
+        clearContent(id);
+        return;
+    }
 }
+
 //添加内容，tr td
-function insertContent(content,id) {
-	clearContent(id);
-	setLocation(id);
-	var json = JSON.parse(content);
-	for (key in json) {
-		var tr = document.createElement("tr");
-		var td2 = document.createElement("td");
-		var td4 = document.createElement("td");
-		tr.setAttribute("bgcolor", "#FFFAFA");
-		tr.setAttribute("border", "0");
-		/*if(id == 'inpatient_no'){
-			td1.innerHTML = "病案号:";
-		}else if(id == 'diag_code'){
-			td1.innerHTML = "ICD码:";
-		}else if(id == 'operate_code'){
-			td1.innerHTML = "手术编码:";
-		}*/
-		td2.innerHTML = key;
-		/*if(id == 'inpatient_no'){
-			td3.innerHTML = "姓名:";
-		}else if(id == 'diag_code'){
-			td3.innerHTML = "诊断名称:";
-		}else if(id == 'operate_code'){
-			td3.innerHTML = "手术名称:";
-		}*/
+function insertContent(content, id) {
+    clearContent(id);
+    setLocation(id);
+    var json = JSON.parse(content);
+    for (key in json) {
+        var tr = document.createElement("tr");
+        var td2 = document.createElement("td");
+        var td4 = document.createElement("td");
+        tr.setAttribute("bgcolor", "#FFFAFA");
+        tr.setAttribute("border", "0");
+        /*if(id == 'inpatient_no'){
+            td1.innerHTML = "病案号:";
+        }else if(id == 'diag_code'){
+            td1.innerHTML = "ICD码:";
+        }else if(id == 'operate_code'){
+            td1.innerHTML = "手术编码:";
+        }*/
+        td2.innerHTML = key;
+        /*if(id == 'inpatient_no'){
+            td3.innerHTML = "姓名:";
+        }else if(id == 'diag_code'){
+            td3.innerHTML = "诊断名称:";
+        }else if(id == 'operate_code'){
+            td3.innerHTML = "手术名称:";
+        }*/
 
-		td4.innerHTML = json[key];
-		//tr.appendChild(td1);
-		tr.appendChild(td2);
-		//tr.appendChild(td3);
-		tr.appendChild(td4);
-		document.getElementById(id+"Content").appendChild(tr);
-		tr.onmouseover = function() {
-			this.className = 'mouseOver';
-			document.getElementById(id).value=$(this).children("td").eq(0).html();
-		};
-		tr.onmouseout = function() {
-			this.className = 'mouseOut';
-		};
-	}
+        td4.innerHTML = json[key];
+        //tr.appendChild(td1);
+        tr.appendChild(td2);
+        //tr.appendChild(td3);
+        tr.appendChild(td4);
+        document.getElementById(id + "Content").appendChild(tr);
+        tr.onmouseover = function () {
+            this.className = 'mouseOver';
+            document.getElementById(id).value = $(this).children("td").eq(0).html();
+        };
+        tr.onmouseout = function () {
+            this.className = 'mouseOut';
+        };
+    }
 }
+
 //清楚内容方法
 function clearContent(id) {
-	var popNode = document.getElementById(id+"Div");
-	popNode.style.border = "none";
-	var contentNode = document.getElementById(id+"Content");
-	var len = contentNode.childNodes.length;
-	for (var i = len - 1; i >= 0; i--) {
-		contentNode.removeChild(contentNode.childNodes[i]);
-	}
+    var popNode = document.getElementById(id + "Div");
+    popNode.style.border = "none";
+    var contentNode = document.getElementById(id + "Content");
+    var len = contentNode.childNodes.length;
+    for (var i = len - 1; i >= 0; i--) {
+        contentNode.removeChild(contentNode.childNodes[i]);
+    }
 }
+
 //设置样式
-function setLocation(id){
-	var inputNode = document.getElementById(id);
-	var width = inputNode.offsetWidth;
-	var left = inputNode["offsetLeft"];
-	var top = inputNode.offsetHeight+inputNode["offsetTop"];
-	var popNode = document.getElementById(id+"Div");
-	popNode.style.border = "gray 0.5px solid";
-	popNode.style.width = width+"px";
-	popNode.style.top = top+"px";
-	popNode.style.left = left+"px";
-	document.getElementById(id+"Content_table").style.width=width+"px";
-}
\ No newline at end of file
+function setLocation(id) {
+    var inputNode = document.getElementById(id);
+    var width = inputNode.offsetWidth;
+    var left = inputNode["offsetLeft"];
+    var top = inputNode.offsetHeight + inputNode["offsetTop"];
+    var popNode = document.getElementById(id + "Div");
+    popNode.style.border = "gray 0.5px solid";
+    popNode.style.width = width + "px";
+    popNode.style.top = top + "px";
+    popNode.style.left = left + "px";
+    document.getElementById(id + "Content_table").style.width = width + "px";
+}
+
+
+
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js b/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
index 7b72b66..e596bfa 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
@@ -416,4 +416,23 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
 		//加载时间控件
 		initDateInput(idVal)
 	}
+}
+
+//全不选
+function checkCancel(array, nameArray) {
+    if (array.length){
+		for (var i = 0; i < array.length; i++){
+            document.getElementById(array[i]).checked = false;
+		}
+	}
+    if (nameArray.length){
+        for (var i = 0; i < nameArray.length; i++){
+            var nameVal = nameArray[i].replace(".","");
+            if($("#div"+nameVal).text() == ($("#div"+nameVal).parent().find('>div:last').text())){
+                $("#div"+nameVal).prev("div").children("div:last-child").remove();
+            }
+            $("#div"+nameVal).remove();
+		}
+	}
+    $("#checks").val('');
 }
\ 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 c4567e8..de378b7 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -146,6 +146,8 @@ function freshTable(){
 		sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
 		paginationPreText : '上一页',
 		paginationNextText : '下一页',
+        paginationFirstText: '<',
+        paginationLastText: '>',
 		detailView: flag,
 		pageNumber: 1,                       //初始化加载第一页，默认第一页
 		pageSize: 5,                       //每页的记录行数（*）
@@ -1127,4 +1129,4 @@ function formatTime(datetime, fmt) {
 				(RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k])
 					.substr(("" + o[k]).length)));
 	return fmt;
-}
\ No newline at end of file
+}