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 @@
-
+
@@ -293,6 +293,9 @@
+
@@ -853,7 +856,7 @@
})
-
+
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 ";