From 6dce0de661cde36d796121d74f454ec4f8938d86 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 21 Feb 2022 11:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=97=85=E6=A1=88=E5=8F=B7=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=98=AF=E5=90=A6=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?,=E5=B8=B8=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=85=88=E6=82=A3=E8=80=85=E5=A7=93=E5=90=8D=E5=8D=87=E5=BA=8F?=
 =?UTF-8?q?=E5=86=8D=E4=BD=8F=E9=99=A2=E6=AC=A1=E6=95=B0=E5=8D=87=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/README.md           |  4 +-
 .../commomSearch/commomListqf.jsp             |  7 ++-
 .../recordManage/commomSearch/commomListqf.js | 49 ++++++++++---------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/config/README.md b/src/main/resources/config/README.md
index 87d3ac7..052ed45 100644
--- a/src/main/resources/config/README.md
+++ b/src/main/resources/config/README.md
@@ -11,4 +11,6 @@
 #2.0.6 2022-01-17
 打印日志增加费用一列，修复打印预览只有一张是上传图片报错、打印下载日志因升级mybatis安全漏洞导致字段类型不匹配
 #2.0.7 2022-01-19
-打印下载日志因升级mybatis安全漏洞导致字段类型不匹配
\ No newline at end of file
+打印下载日志因升级mybatis安全漏洞导致字段类型不匹配
+#2.0.8 2022-02-21
+常用查询页面增加病案号切换是否模糊查询,常用查询排序先患者姓名升序再住院次数升序
\ No newline at end of file
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 c536e6c..ef46f56 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -196,7 +196,7 @@
                         <input type="hidden" id="showPrint" value="${CURRENT_USER.userAge}">
                         <input type="hidden" id="flag" value="file_path">
                         <!--查询的sql ORDER BY 语句-->
-                        <input type="hidden" id="orderBys" value=" order by commomtable.name">
+                        <input type="hidden" id="orderBys" value=" order by commomtable.name,commomtable.admiss_times">
                         <!--该用户借阅申请的审批过了且未过期的病案，不可重复申请，可查看的病案主键patientId-->
                         <input type="hidden" id="approves">
                         <!--该用户下载申请的审批过了且未过期的病案，不可重复申请，可查看的病案主键patientId-->
@@ -293,6 +293,9 @@
                                     <div class="col-sm-8 inputDiv">
                                         <input type="text" class="form-control input-sm inputValue" id="inpatient_no"
                                                maxlength="16">
+                                        <input type="checkbox" id="inpatientNoCheckbox"
+                                               class="otherTable operTable isOperInput"><label for="inpatientNoCheckbox"
+                                                                                               class="checkBoxClass">模糊查询</label>
                                     </div>
                                 </div>
                             </div>
@@ -853,7 +856,7 @@
     })
 </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?time=2021-12-23"></script>
+<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/commomListqf.js?time=2022-02-21_1"></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>
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index 00bdae4..93cd33c 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -369,33 +369,38 @@ function getSql() {
         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] + "%')";
+            var inpatientNoCheckbox = $("#inpatientNoCheckbox").is(':checked');
+            if(inpatientNoCheckbox) {
+                //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 ";
                 }
-                whereNames += " AND ";
-            } else {
-                whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+            }else{
+                whereNames += commomtable + "." + name + " = '" + $("#" + name).val() + "' AND ";
             }
         }
-        //ID号
+        //ID
         if ($("#admiss_id").val() != '') {
             name = 'admiss_id';
             whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";