测试，优化

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp

@@ -852,8 +852,8 @@
         $(".modal-dialog").draggable();//为模态对话框添加拖拽
     })
 </script>
-<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js?time=2021-11-28"></script>
-<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/commomListqf.js?t=1"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/commomListqf.js?time=2021-11-28"></script>
 <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
 <script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 <script type="text/javascript" src="${path}/static/js/commom.js"></script>

src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp

@@ -180,7 +180,6 @@
     <input type="hidden" id="showPrint" value="${CURRENT_USER.userAge}">
     <input type="hidden" id="flag" value="file_path">
     <input type="hidden" id="powerMenus" value="${power_menus}">
-    <input type="hidden" id="orderBys">
     <input type="hidden" id="approves">
     <!--该用户下载申请的审批过了且未过期的病案，不可重复申请，可查看的病案主键patientId-->
     <input type="hidden" id="loads">
@@ -189,6 +188,10 @@
     <input type="hidden" id="tableThNames">
     <input type="hidden" id="fields" value="${fields}">
     <input type="hidden" id="fieldCns" value="${fieldCns}">
+    <input id="englishFields" hidden>
+    <input id="fromTableSql" hidden>
+    <input id="whereSql" hidden>
+    <input type="hidden" id="orderBys" value=" order by commomtable.name">
     <!--查询总行数-->
     <input type="hidden" id="rows">
     <div class="row btns"  style="clear:both;text-align: right">
@@ -314,8 +317,8 @@
         $(".modal-dialog").draggable();//为模态对话框添加拖拽
     })
 </script>
-<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/customSearchIframeqf.js"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js?time=2021-11-28"></script>
-<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js?time=2020-02-14"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/customSearchIframeqf.js?time=2021-11-28"></script>
 <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
 <script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 </body>

src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js

@@ -30,25 +30,13 @@ var date_format= /^(\d{4})-(0\d{1}|1[0-2])-(0\d{1}|[12]\d{1}|3[01])$/;
 var commomtable = 'commomtable';
 //拼接sql
 function getSql() {
-	var blockVal = $("#block").text();
+
-	if($.trim(blockVal) != '') {
-		//搜索框值不能为空
-		var flag = true;
-		$("#block").children().find('[class=inputDiv]').find('input').each(function(){
-			if($(this).val() == ''){
-				flag = false;
-				return false;
-			}
-		})
-		if(!flag){
-			$("#sql").val("");
-		}else {
     //表头集合
     var tableThNames = '';
     //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,';
+    var selectNames = '';
     //from语句字符串
-			var fromTableNames = ' from ';
+    var fromTableNames = '';
     //数据字典转换语句
     var dictionaryConvertStr = '';
     //on语句字符串
@@ -144,8 +132,6 @@ function getSql() {
     if (array.length != 0) {
         basicTable = commomtable + '.patient_id = ';
     }
-			//单表
-			fromTableNames += commomtable;
     var age = '';
     var age_month = '';
     var age_day = '';
@@ -219,12 +205,6 @@ function getSql() {
             whereNames += val + ' ';
         }
     })
-			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';
     for (var i = 0; i < array.length; i++) {
         //拼接from语句
         if (array.length != 0) {
@@ -243,19 +223,9 @@ function getSql() {
         fromTableNames += dictionaryConvertStr;
     }
     selectNames = selectNames.substring(0, selectNames.length - 1);
-			//console.log(dictionaryConvertStr)
-			//console.log(tableThNames)
-			//console.log(selectNames);
-			//console.log(fromTableNames);
-			//console.log(onNames);
-			//console.log(whereNames);
-			var orderBys = " order by " + commomtable + ".inpatient_no," + commomtable + ".admiss_times";
-			var sql = selectNames + fromTableNames + whereNames;
-			$("#orderBys").val(orderBys);
-			$("#sql").val(sql);
-			//console.log("sql = " + $("#sql").val());
-			//console.log(sql);
     $("#tableThNames").val(tableThNames);
+    $("#englishFields").val(selectNames);
+    $("#fromTableSql").val(fromTableNames);
     if (tableThNames != '') {
         var fieldCns = '';
         var fields = $("#fields").val().split(",");
@@ -275,9 +245,19 @@ function getSql() {
         }
         $("#fieldCns").val(fieldCns);
     }
+	var blockVal = $("#block").text();
+	if($.trim(blockVal) != '') {
+		//搜索框值不能为空
+		var flag = true;
+		$("#block").children().find('[class=inputDiv]').find('input').each(function(){
+			if($(this).val() == ''){
+				flag = false;
+				return false;
+			}
+		})
+		if(flag){
+            $("#whereSql").val(whereNames);
 		}
-	}else{
-		$("#sql").val("");
 	}
 }
 
@@ -318,58 +298,6 @@ function search(){
 		toastr.warning("搜索条件不能为空!");
 	}
 }
-//导出excel功能
-function exportExcel(){
-	var blockVal = $("#block").text();
-	if($.trim(blockVal) != ''){
-		//搜索框值不能为空
-		var flag = true;
-		$("#block").children().find('[class=inputDiv]').find('input').each(function(){
-			if($(this).val() == ''){
-				flag = false;
-				return false;
-			}
-		})
-		if(!flag){
-			toastr.warning("不能为空值，如不需要请取消选项！");
-		}else{
-			getSql();
-			var checks = $("#checks").val();
-			var sql = $("#sql").val();
-			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);
-				sql += ' AND '+commomtable+'.patient_id IN ('+checks+')';
-				sql += orderBys;
-				var url = path + "/template/exportExcel";
-				post(url,{"sql":sql,"tableThNames":tableThNames,"fieldCns":fieldCns});
-			}else {
-				if ($("#rows").val() > 5000) {
-					toastr.warning("数据量大,暂提供5000条以内数据导出!");
-				} 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});
-							}
-						}
-					})
-				}
-			}
-		}
-	}else{
-		toastr.warning("搜索条件不能为空!");
-	}
-}
 //查看详情
 function showDetail(patientId){
 	//隐藏模板选项

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js

@@ -298,6 +298,7 @@ function exportExcel() {
 	if ($("#rows").val() > 5000 && checks == '') {
 		toastr.warning("数据量大,暂提供5000条以内数据导出!");
 	} else {
+		getSql();
 		var tableThNames = $("#tableThNames").val();
 		var fieldCns = $("#fieldCns").val();
 		if (checks != '') {
@@ -305,9 +306,8 @@ function exportExcel() {
 			checks = checks.substring(0, checks.length - 1);
 			var whereSql = ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')';
 			var url = path + "/template/exportExcel";
-			post(url, {"selectSql": $("#englishFields").val(),"whereSql":whereSql,"tableThNames": tableThNames, "fieldCns": fieldCns});
+			post(url, {"selectSql": $("#englishFields").val(),"fromTableSql":$("#fromTableSql").val(),"whereSql":whereSql,"tableThNames": tableThNames,orderBys:$("#orderBys").val(), "fieldCns": fieldCns});
 		} else {
-			getSql();
 			Common.confirm({
 				title: "提示",
 				message: "没有选中，您确定要按搜索栏条件导出?",