From a5cf7b4b239a6f2e130560e3f387d9249d3d67ba Mon Sep 17 00:00:00 2001
From: wangxh <java888888ly@163.com>
Date: Wed, 29 Apr 2020 13:56:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=97=85=E6=A1=88=E5=8F=B7=E3=80=81=E4=BD=8F?=
 =?UTF-8?q?=E9=99=A2ID=E3=80=81=E7=9B=98=E5=8F=B7=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commomSearch/showRecord174.jsp            |  2 +-
 .../templateSearch/customSearchIfameqf.jsp    | 17 ++++++---
 src/main/webapp/index.jsp                     |  2 +-
 .../templateSearch/customSearchIframeqf.js    | 38 +++++++++++++++++--
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
index 8eac263..85f86fd 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
@@ -806,7 +806,7 @@
     </div>
 </div>
 <!-- 模态框3（Modal）添加资料 -->
-<div class="modal fade" id="myModal3" tabindex="-1" role="dialog" aria-labelledby="myModalLabe3" aria-hidden="true">
+<div class="modal fade" id="myModal3" tabindex="-1" role="dialog" aria-labelledby="myModalLabe3" aria-hidden="true"自定义查询>
     <div class="modal-dialog" style="width:90%;height:90%">
         <div class="modal-content">
             <div class="modal-header">
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 0f92c8f..a478fde 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp
@@ -143,12 +143,16 @@
     <div class="panel">
         <div class="panel-heading" style="padding:0px 14px!important;">
             <h5>
-                <a data-toggle="collapse" href="#b">
-                    可收缩
-                </a>
-                <a data-toggle="collapse" onclick="checkCancel(array, nameArray)">
-                    取消
-                </a>
+                <div style="float: left; width: 10%">
+                    <a data-toggle="collapse" href="#b">
+                        可收缩
+                    </a>
+                </div>
+                <div style="margin-left: 80%; width: 10%">
+                    <a data-toggle="collapse" href="#c" onclick="checkCancel(array, nameArray)">
+                        所选取消
+                    </a>
+                </div>
             </h5>
         </div>
         <div id="b" class="panel-collapse collapse in">
@@ -161,6 +165,7 @@
                 </div>
             </div>
         </div>
+        <div id="c" class="panel-collapse collapse in"></div>
     </div>
 </div>
 <div class="bottomDiv">
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index dbe451c..22c27c1 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -151,7 +151,7 @@
                                 <ul class="dropdown-menu" role="menu">
                                     <%--<li><a href="#">帮助</a></li>
                                     <li><a href="#">联系我们</a></li>--%>
-                                    <li><a href="<%= POWER_JSP %>/gatewayPage">返回首页</a></li>
+                                    <li><a href="<%= POWER_JSP %>/gatewayPage">返回主页</a></li>
                                     <li class="divider"></li>
                                     <li><a href="<%= POWER_JSP %>/logout?token=<%= token %>">退出登陆</a></li>
                                 </ul>
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js b/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
index cb6284e..45c7bd4 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js
@@ -55,6 +55,8 @@ function getSql() {
 			var onNames = '';
 			//公共表名
 			var basicTable = '';
+			//查询字段数组
+			var selectArray = new Array();
 			var array = new Array();
 			//选中个数
 			var checks = 0;
@@ -120,12 +122,18 @@ function getSql() {
 					val = 't_dictionary_10.NAME AS diagType';
 					dictionaryConvertStr += " LEFT JOIN dbo.emr_dictionary AS t_dictionary_10 ON t_diag.diag_type = t_dictionary_10.CODE AND t_dictionary_10.parent_id = 'dis_diag_type'";
 				}
-				//拼接select语句
-				selectNames += val + ",";
+                if (push_unique(val, selectArray)){
+                	selectArray.push(val);
+				}
 				if ($(this).is(':checked')) {
 					checks++;
 				}
 			})
+            //拼接select语句
+            for (var i = 0; i < selectArray.length; i++){
+                //拼接select语句
+                selectNames += selectArray[i] + ",";
+			}
 			//where语句字符串
 			var whereNames = ' where ';
 			//拼接条件前括号
@@ -141,6 +149,7 @@ function getSql() {
 			var age = '';
 			var age_month = '';
 			var age_day = '';
+			var inpatientNo = '';
 			$("#block").children().find('div').each(function () {
 				var val = $(this).children().val();
 				var className = $(this).children().attr('class');
@@ -168,7 +177,9 @@ function getSql() {
 						whereNames += "between '" + val + "' and '" + select22Val + "') ";
 					} else {
 						//数字
-						if(age != '' && age == commomtable+'.age'){
+						if(inpatientNo != '' && inpatientNo == commomtable+'.inpatient_no'){
+							whereNames += "between '" + val + "' and '" + select22Val + "'))";
+						} else if(age != '' && age == commomtable+'.age'){
 							whereNames += "between " + val + " and " + (select22Val-1) + " OR ("+commomtable+".age = "+select22Val+" AND "+commomtable+".age_month = 0 AND "+commomtable+".age_day = 0))) ";
 						}else if(age_month != '' && age_month == commomtable+'.age_month'){
 							whereNames += "between " + val + " and " + (select22Val-1) + " AND "+commomtable+".age = 0 OR ("+commomtable+".age = 0 AND "+commomtable+".age_month = "+select22Val+" AND "+commomtable+".age_day = 0))) ";
@@ -195,10 +206,15 @@ function getSql() {
 						age_day = val;
 						whereNames += "(";
 					}
+					if (val == commomtable+'.inpatient_no') {
+						inpatientNo = val;
+						whereNames += "(";
+					}
 					if (val == 'and') {
                         age = '';
                         age_month = '';
                         age_day = '';
+                        inpatientNo = '';
 					}
 					whereNames += val + ' ';
 				}
@@ -264,6 +280,22 @@ function getSql() {
 		$("#sql").val("");
 	}
 }
+
+/**
+ * 排重
+ * @param val
+ * @param selectArray
+ * @returns {boolean}
+ */
+function push_unique(val, selectArray) {
+	var i = selectArray.length;
+    while (i--) {
+        if (selectArray[i] === val) {
+            return false; // 返回的这个 i 就是元素的索引下标，
+        }
+    }
+    return true;
+}
 //搜索功能
 function search(){
 	var blockVal = $("#block").text();