From cc09a5b7df59fed1ceb8effc393315fad02e4e56 Mon Sep 17 00:00:00 2001 From: hujl <123@qq.com> Date: Wed, 28 Apr 2021 11:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E8=A2=AB=E6=B8=85=E7=A9=BA=E5=8F=8A=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/beHospitaledDir/beHospList.jsp | 26 +++------- .../WEB-INF/views/commitDir/commitList.jsp | 22 ++------ .../WEB-INF/views/faultDir/faultList.jsp | 43 ++++------------ .../views/inHospitalDir/inHositalList.jsp | 50 ++++++------------- .../views/lastVerifyDir/lastVerifyList.jsp | 21 ++------ .../medicalHandlerDir/medicalHandlerList.jsp | 45 ++++++----------- .../medicalOverdueDir/medicalOverdueList.jsp | 26 +++------- .../medicalRecallDir/medicalRecallList.jsp | 20 ++------ .../MedicalRecordStorage.jsp | 23 +++++---- .../unfileMedicalDir/unfileMedicalList.jsp | 33 +++--------- .../WEB-INF/views/vCountDir/vCountList.jsp | 2 +- 11 files changed, 87 insertions(+), 224 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 4a038f38..87c9cc42 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -518,15 +518,15 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> -
@@ -3738,17 +3738,11 @@ // deptName = $("#deptName").val(); // } - // var len = ($("#deptName").val()).length; - // if (len > 0) { - // var deptNameT = $("#deptName").val(); - // if (deptNameT.indexOf("") == -1) { - // deptName = $("#deptName").val().toString(); - // } - // } - var len = value.length; + var len = ($("#deptName").val()).length; if (len > 0) { - if (value.indexOf("") == -1) { - deptName = value.toString(); + var deptNameT = $("#deptName").val(); + if (deptNameT.indexOf("") == -1) { + deptName = $("#deptName").val().toString(); } } @@ -4955,19 +4949,13 @@ } }); - var value = []; //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } if (tipLoad == 0) {//refreshOptions $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - - //$("#deptName").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index f4771f5e..ef81a974 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -436,7 +436,7 @@ <%--<%––%>--%> <%----%> @@ -3078,17 +3078,11 @@ } var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // var len = ($("#deptName").val()).length; - // if (len > 0) { - // var deptNameT = $("#deptName").val(); - // if (deptNameT.indexOf("") == -1) { - // deptName = $("#deptName").val().toString(); - // } - // } - var len = value.length; + var len = ($("#deptName").val()).length; if (len > 0) { - if (value.indexOf("") == -1) { - deptName = value.toString(); + var deptNameT = $("#deptName").val(); + if (deptNameT.indexOf("") == -1) { + deptName = $("#deptName").val().toString(); } } //console.log(deptName); @@ -4267,21 +4261,15 @@ } }); - var value = []; //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - //$("#deptName").val([]); }); - //添加pdf记录 $("#addPdfBtn").click(function () { if ($('#inpType').val() != null && $('#inpType').val() != "") { diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index b65c9973..de756130 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -92,8 +92,8 @@ <%--<%––%>--%> <%----%> @@ -238,32 +238,15 @@ this.pageSize = currPageSize; } - // var url = window.location.href; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // - // var len = ($("#deptName").val()).length; - // if (len > 0) { - // var deptNameT = $("#deptName").val(); - // if (deptNameT.indexOf("") == -1) { - // deptName = $("#deptName").val().toString(); - // } - // } - - // var url = window.location.href; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // - // var len = value.length; - // if (len > 0) { - // if (value.indexOf("") == -1) { - // deptName = value.toString(); - // } - // } + var url = window.location.href; + var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - var deptName = value; - if (deptName.indexOf("") != -1) { - deptName = ""; - } else { - deptName = value.toString(); + var len = ($("#deptName").val()).length; + if (len > 0) { + var deptNameT = $("#deptName").val(); + if (deptNameT.indexOf("") == -1) { + deptName = $("#deptName").val().toString(); + } } var temp = { @@ -497,20 +480,14 @@ } } - - var value = []; //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0){ - value = $("#deptName").val(); - } //查询之后重新从第一页算起 if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 } else { toastr.warning("正在查询，请稍等..."); } - $("#deptName").val([]); }); diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 4b9e6c50..8e016d62 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -476,9 +476,9 @@ <%--<%––%>--%> <%----%> +
@@ -2371,41 +2371,23 @@ // deptList.push("20050102"); // deptList.push("20070102"); - // var url = window.location.href; - // var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // var len = ($("#deptName").val()).length; - // var bol=0; - // var deptStr=""; - // if (len > 0) { - // var deptName = $("#deptName").val(); - // for(var m=0;m 0) { - for (var m = 0; m < value.length; m++) { - if (value[m] != "") { - //console.log("m:" + value[m]); - deptStr += value[m] + ","; - } else { - bol = 1 + var deptName = $("#deptName").val(); + for(var m=0;m 0) { - value = $("#deptName").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - //$("#deptName").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 3fc62b67..584715e1 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -437,7 +437,7 @@ <%--<%––%>--%> <%----%>
@@ -2197,7 +2197,6 @@ }); - function getDept() { //获取科室列表 $.ajax({ @@ -2206,6 +2205,7 @@ data: {effective: 1, typecode: "dept_code"}, success: function (result) { if (result != null) { + for (var i = 0; i < result.length; i++) { $("#deptName").append(""); } @@ -2914,18 +2914,11 @@ // deptName = $("#deptName").val(); // } // - // var deptName = $("#deptName").val(); - // if (deptName.indexOf("") != -1) { - // deptName = ""; - // } else { - // deptName = $("#deptName").val().toString(); - // } - - var deptName = value; + var deptName = $("#deptName").val(); if (deptName.indexOf("") != -1) { deptName = ""; } else { - deptName = value.toString(); + deptName = $("#deptName").val().toString(); } var temp = { @@ -2943,7 +2936,6 @@ endDateTo: $("#endDateTo").val(), isscaned: $("#isscaned").val(), isScanning: $("#isScanning").val() - }; return temp; }, @@ -4018,18 +4010,13 @@ } }); - var value = []; //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - $("#deptName").val([]); }); diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp index 5f87e8f6..9ec14d62 100644 --- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp @@ -328,9 +328,9 @@ --%>
- +
<%--
@@ -362,8 +362,9 @@
- +
@@ -1926,21 +1927,18 @@ this.pageSize = currPageSize; } - var deptName = value; - if (deptName.indexOf("") != -1) { - deptName = ""; - } else { - deptName = value.toString(); + + var deptNameA = $("#deptName").val().toString(); + if (deptNameA.indexOf("--") != -1) { + deptNameA = ""; } - var handleName = handleNameValue; - if (handleName.indexOf("") != -1) { + + var handleName = $("#handleName").val().toString(); + if (handleName.indexOf("--") != -1 ) { handleName = ""; - } else { - handleName = handleNameValue.toString(); } - var temp = { limit: limit, //页面大小 offset: offset, //页码 @@ -1950,9 +1948,9 @@ inpNo: "" + $("#inpNo").val(), visitId: "" + $("#visitId").val(), name: "" + $("#name").val(), - deptName: deptName.toString(), + deptName: deptNameA, followingType:$("#followingType").val(), - handleId:handleName.toString(), + handleId:handleName, startHandleTime: $("#startHandleTime").val(), endHandleTime: $("#endHandleTime").val(), }; @@ -2727,24 +2725,13 @@ } }); - var value = []; - var handleNameValue = []; - - //查询 + //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0){ - value = $("#deptName").val(); - } - if ($("#handleName").val().length > 0){ - handleNameValue = $("#handleName").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - //$("#deptName").val([]); - //$("#handleName").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp index 982bca70..49753dbf 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -259,7 +259,7 @@
@@ -1781,18 +1781,14 @@ this.pageSize = currPageSize; } - var deptName = value; - if (deptName.indexOf("") != -1) { + var deptName = $("#deptName").val().toString(); + if (deptName.indexOf("") != -1 && deptName.length<=0) { deptName = ""; - } else { - deptName = value.toString(); } - var deptAdmissionTo = value2; - if (deptAdmissionTo.indexOf("") != -1) { + var deptAdmissionTo = $("#deptAdmissionTo").val().toString(); + if (deptAdmissionTo.indexOf("") != -1 && deptAdmissionTo.length<=0) { deptAdmissionTo = ""; - } else { - deptAdmissionTo = value2.toString(); } @@ -2287,24 +2283,14 @@ } }); - var value = []; - var value2 = []; + //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } - - if ($("#deptAdmissionTo").val().length > 0) { - value2 = $("#deptAdmissionTo").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - //$("#deptName").val([]); - //$("#deptAdmissionTo").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index 8329bfca..93e14bbd 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -111,8 +111,8 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> -
@@ -394,11 +394,8 @@ this.pageSize = currPageSize; } - var url = window.location.href; - var deptName = ''; + //var url = window.location.href; // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - - // var len = ($("#deptName").val()).length; // if (len > 0) { // var deptNameT = $("#deptName").val(); @@ -406,14 +403,7 @@ // deptName = $("#deptName").val().toString(); // } // } - // var url = window.location.href; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - var len = value.length; - if (len > 0) { - if (value.indexOf("") == -1) { - deptName = value.toString(); - } - } + var temp = { limit: limit, //页面大小 @@ -425,7 +415,7 @@ name:""+$("#name").val(), archivestate: "" + $("#archivestate").val(), state:"" + $("#state").val(), - deptName: deptName.toString() + deptName: $("#deptName").val().toString() }; return temp; }, diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index 01f422c1..b4f29bc0 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -115,7 +115,7 @@ <%--<%––%>--%> <%----%> @@ -348,9 +348,9 @@ this.pageSize = currPageSize; } - var url = window.location.href; - var deptName = ''; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + //var url = window.location.href; + //var deptName = ''; + //var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // var len = ($("#deptName").val()).length; @@ -362,11 +362,16 @@ // } // var url = window.location.href; // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - var len = value.length; + /* var len = value.length; if (len > 0) { if (value.indexOf("") == -1) { deptName = value.toString(); } + }*/ + + var deptNameA = $("#deptName").val().toString(); + if (deptNameA.indexOf("") != -1 && deptNameA.length<=0) { + deptNameA = ""; } var temp = { @@ -379,7 +384,7 @@ name: "" + $("#name").val(), archivestate: "" + $("#archivestate").val(), // state:"" + $("#state").val(), - deptName: deptName.toString() + deptName: deptNameA }; return temp; }, @@ -566,18 +571,14 @@ $("#danganhao1").html(archiveDetailId); } - var value = []; + //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - //$("#deptName").val([]); }); //获取table的高度 diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 5af9c11e..986c363d 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -528,7 +528,7 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> - @@ -552,8 +552,8 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> - @@ -2850,28 +2850,20 @@ // deptName = $("#deptName").val(); // } - // var deptName = $("#deptName").val(); - // if (deptName.indexOf("") != -1) { - // deptName = ""; - // } else { - // deptName = $("#deptName").val().toString(); - // } - - var deptName = value; + var deptName = $("#deptName").val(); if (deptName.indexOf("") != -1) { deptName = ""; } else { - deptName = value.toString(); + deptName = $("#deptName").val().toString(); } - var deptAdmissionTo = value2; + var deptAdmissionTo = $("#deptAdmissionTo").val(); if (deptAdmissionTo.indexOf("") != -1) { deptAdmissionTo = ""; } else { - deptAdmissionTo = value2.toString(); + deptAdmissionTo = $("#deptAdmissionTo").val().toString(); } - var temp = { limit: limit, //页面大小 offset: offset, //页码 @@ -3880,24 +3872,13 @@ } }); - var value = []; - var value2 = []; //查询 $('#searchBtn').click(function () { - if ($("#deptName").val().length > 0) { - value = $("#deptName").val(); - } - - if ($("#deptAdmissionTo").val().length > 0) { - value2 = $("#deptAdmissionTo").val(); - } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { toastr.warning("正在查询，请稍等..."); } - // $("#deptName").val([]); - // $("#deptAdmissionTo").val([]); }); //添加pdf记录 diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index cd4b8d02..572f3f17 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -85,7 +85,7 @@ <%--<%––%>--%> <%----%>