From 820b25f488ddeed8d5e583f8e92584335121abdb Mon Sep 17 00:00:00 2001 From: hujl Date: Wed, 12 Jan 2022 11:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=BD=92=E6=A1=A3=E3=80=81=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E8=B6=85=E6=9C=9F=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E3=80=81=E4=BC=98=E5=8C=96=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/commitController.java | 2 +- .../resources/mapper/Archive_MasterMapper.xml | 145 +++++++++++------ .../views/beHospitaledDir/beHospList.jsp | 38 ++--- .../WEB-INF/views/commitDir/commitList.jsp | 148 ++++++++++-------- .../medicalOverdueDir/medicalOverdueList.jsp | 4 +- 5 files changed, 209 insertions(+), 128 deletions(-) diff --git a/src/main/java/com/emr/controller/commitController.java b/src/main/java/com/emr/controller/commitController.java index 358f5897..b9a61365 100644 --- a/src/main/java/com/emr/controller/commitController.java +++ b/src/main/java/com/emr/controller/commitController.java @@ -167,7 +167,7 @@ public class commitController { public void exportBbSelExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); String[] header = {"科室编码","科室名称","出院人数","已初审病历数","未初审病历数","超期未初审病历数"}; - String[] fileNames = {"dept_name","name","checkDoctor","lockinfo","inpNo","visitId"}; + String[] fileNames = {"deptName","name","checkDoctor","lockinfo","inpNo","visitId"}; //文件名 String fileName = "当前科室归档情况报表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index ce61d960..2acf8087 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -958,67 +958,122 @@ - + delete from archive_master diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 24e746ef..d345980d 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -2854,15 +2854,15 @@ if (result.indexOf("成功") != -1) { if (flag == 0) { //$("#doctorModal").modal('hide'); - //$("#table").bootstrapTable("refresh"); + //$("#table").bootstrapTable("refresh"); toastr.success("归档医生提交成功!"); } else if (flag == 1) { //$("#nursModal").modal('hide'); - // $("#table").bootstrapTable("refresh"); + // $("#table").bootstrapTable("refresh"); toastr.success("归档护士提交成功!"); } } else { - // $("#table").bootstrapTable("refresh"); + // $("#table").bootstrapTable("refresh"); toastr.warning(result); } } @@ -3010,10 +3010,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - /* var currDate=getCurrDate(); - var currDate30=getCurrDay30(); - $('#startDateTo').val(currDate30); - $('#endDateTo').val(currDate);*/ + /* var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDateTo').val(currDate30); + $('#endDateTo').val(currDate);*/ $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); @@ -3784,8 +3784,8 @@ limit = currPageSize; this.pageSize = currPageSize; } - // var url = window.location.href; - //var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + var url = window.location.href; + var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // if (deptName != null && deptName != "") { // //$("#deptName").hide(); // deptName += "," + $("#deptName").val(); @@ -3795,7 +3795,6 @@ // if ($("#deptName").val() != null && $("#deptName").val() != "") { // deptName = $("#deptName").val(); // } - var deptName=""; var len = ($("#deptName").val()).length; if (len > 0) { var deptNameT = $("#deptName").val(); @@ -3876,7 +3875,7 @@ if(index.indexOf("cmtNurseBack") != -1) { html = html + ''; } - } + } } } if (index.indexOf("qxSel") != -1) { @@ -4417,7 +4416,7 @@ if (value == '提交') { a = '已提交'; } else { - a = '未提交'; + a = '未提交'; } } else { @@ -4425,7 +4424,7 @@ //有缺陷显示红色 #269abc; a = '已提交'; } else { - a = '未提交'; + a = '未提交'; } } @@ -4444,7 +4443,7 @@ if (value == '提交') { a = '已提交'; } else { - a = '未提交'; + a = '未提交'; } } else { @@ -4453,7 +4452,7 @@ //有缺陷显示红色 a = '已提交'; } else { - a = '未提交'; + a = '未提交'; } } @@ -4953,7 +4952,7 @@ var target = document.getElementById('delPdfBody'); spinner.spin(target);//给id为foo的div 中绑上spinner var pdfPath = row.pdfPath;//.replaceAll("\\","/"); - //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf + //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf //console.log( pdfPath ); if (pdfPath != "") { pdfPath = pdfPath.replace(/(\\)+/g, '/'); @@ -5103,7 +5102,8 @@ //导出excel功能 $("#excelBtn").click(function () { - 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(); @@ -5124,7 +5124,7 @@ window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&archivestate=" + archivestate + "&deptName=" + deptName + "&emrCmit=" + emrCmit + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo - + "&bedNumber=" + bedNumber + "&printNum=" + printNum;//+ "&doctorInCharge=" + doctorInCharge + + "&bedNumber=" + bedNumber + "&printNum=" + printNum;//+ "&doctorInCharge=" + doctorInCharge }); @@ -5210,7 +5210,7 @@ $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 $('#table2').bootstrapTable('refresh'); - idArr = []; + idArr = []; } } }; diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 6ba5c745..3a603a32 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -524,7 +524,7 @@
-
+
@@ -532,6 +532,10 @@
+
+ + +
@@ -576,7 +580,7 @@
-
+
@@ -584,6 +588,10 @@
+
+ + +
@@ -2422,14 +2430,32 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - /* var currDate=getCurrDate(); - var currDate30=getCurrDay30(); - $('#startDateTo').val(currDate30); - $('#endDateTo').val(currDate); - $('#startDateTo4').val(currDate30); - $('#endDateTo4').val(currDate); - $('#startDateTo5').val(currDate30); - $('#endDateTo5').val(currDate);*/ + + var startDateTo = ""; + var endDateTo = ""; + if (($("#startDateTo").val() == "" && $("#endDateTo").val() == "") || ($("#startDateTo4").val() == "" && $("#endDateTo4").val() == "") ||($("#startDateTo5").val() == "" && $("#endDateTo5").val() == "") ) { + //获取当前日期 + var myDate = new Date(); + var nowY = myDate.getFullYear(); + var nowM = myDate.getMonth() + 1; + var nowD = myDate.getDate(); + endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期 + + //获取三十天前日期 + var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思 + var lastY = lw.getFullYear(); + var lastM = lw.getMonth() + 1; + var lastD = lw.getDate(); + startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期 + // console.log(endDateTo); + // console.log(startDateTo); + $('#startDateTo4').val(startDateTo); + $('#endDateTo4').val(endDateTo); + $("#startDateTo5").val(startDateTo); + $("#endDateTo5").val(endDateTo); + $('#startDateTo').val(startDateTo); + $('#endDateTo').val(endDateTo); + } $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); @@ -3522,7 +3548,7 @@ return html; } }, { - title: '状态', + title: '归档状态', field: 'archivestate', align: 'center', valign: 'middle', @@ -4525,32 +4551,15 @@ var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); //console.log(deptName); - var startDateTo = $("#startDateTo4").val(); - var endDateTo = $("#endDateTo4").val(); - if (startDateTo == "" && endDateTo == "") { - //获取当前日期 - var myDate = new Date(); - var nowY = myDate.getFullYear(); - var nowM = myDate.getMonth() + 1; - var nowD = myDate.getDate(); - endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期 - - //获取三十天前日期 - var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思 - var lastY = lw.getFullYear(); - var lastM = lw.getMonth() + 1; - var lastD = lw.getDate(); - startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期 - // console.log(endDateTo); - // console.log(startDateTo); - } + var temp = { limit: limit, //页面大小 offset: offset, //页码 order: params.order, //排位命令（desc，asc） deptName: deptName.toString(), - startDateTo: startDateTo, - endDateTo: endDateTo + remark:""+$("#overdue1").val(), + startDateTo: $("#startDateTo4").val(), + endDateTo: $("#endDateTo4").val() }; return temp; }, @@ -4581,6 +4590,7 @@ field: 'name', align: 'left', valign: 'middle', + width: 200, }, { @@ -4588,27 +4598,28 @@ field: 'checkDoctor', align: 'left', valign: 'middle', + width: 150 }, { title: '已初审病历数', field: 'lockinfo', align: 'left', valign: 'middle', - width: 150, // 定义列的宽度，单位为像素px + width: 150 // 定义列的宽度，单位为像素px }, { title: '未初审病历数', field: 'inpNo', align: 'center', valign: 'middle', - width: 50, // 定义列的宽度，单位为像素px + width: 150 // 定义列的宽度，单位为像素px }, { title: '超期未初审病历数', field: 'visitId', align: 'center', valign: 'middle', - width: 80, + width: 150, cellStyle: function (value, row, index) { return {classes: 'success'} @@ -4686,32 +4697,15 @@ var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); //console.log(deptName); - var startDateTo = $("#startDateTo5").val(); - var endDateTo = $("#endDateTo5").val(); - if (startDateTo == "" && endDateTo == "") { - //获取当前日期 - var myDate = new Date(); - var nowY = myDate.getFullYear(); - var nowM = myDate.getMonth() + 1; - var nowD = myDate.getDate(); - endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期 - - //获取三十天前日期 - var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思 - var lastY = lw.getFullYear(); - var lastM = lw.getMonth() + 1; - var lastD = lw.getDate(); - startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期 - // console.log(endDateTo); - // console.log(startDateTo); - } + var temp = { limit: limit, //页面大小 offset: offset, //页码 order: params.order, //排位命令（desc，asc） deptName: deptName.toString(), - startDateTo: startDateTo, - endDateTo: endDateTo + remark:""+$("#overdue2").val(), + startDateTo: $("#startDateTo5").val(), + endDateTo: $("#endDateTo5").val() }; return temp; }, @@ -4777,27 +4771,57 @@ field: 'archivestate', align: 'left', valign: 'middle', + width: 150, + formatter: function (value, row, index) { + //在院 未归档 归档中 初审 已归档 已认证 + var a = ''; + var days;//= daysBetween('2016-12-01', '2016-11-02'); + //console.log(days+"============相差天数"+show()+row.dischargeDateTime.split(" ")[0]); + if (row.dischargeDateTime != null && row.dischargeDateTime != "") { + days = daysBetween(show(), row.dischargeDateTime.split(" ")[0]); + } + if (value == "初审") { + //获取properties配置文件中的属性值 + var expired = <%=res.getString("expired")%>; + if (days > expired) { + a = '' + value + '(超期)'; + } else { + a = '' + value + ''; + } + } else if (value == "已认证") { + a = '' + value + ''; + } else if (value == "复审退回") { + a = '' + value + ''; + } else if (value == "提交") { + a = '' + value + ''; + } else if (value == "主任退回") { + a = '' + value + ''; + }else{ + a = '' + value + ''; + } + return a; + } }, { title: '主管医生', field: 'doctorInCharge', align: 'left', valign: 'middle', - width: 150, // 定义列的宽度，单位为像素px + width: 150 // 定义列的宽度，单位为像素px }, { title: '入院时间', field: 'admissionDateTime', align: 'center', valign: 'middle', - width: 50, // 定义列的宽度，单位为像素px + width: 260 // 定义列的宽度，单位为像素px }, { title: '超期天数', field: 'nurseName', align: 'center', valign: 'middle', - width: 80, + width: 200, cellStyle: function (value, row, index) { return {classes: 'success'} @@ -4863,6 +4887,7 @@ var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); var startDateTo = $("#startDateTo4").val(); var endDateTo = $("#endDateTo4").val(); + var remark=""+$("#overdue1").val(); if (startDateTo == "" && endDateTo == "") { //获取当前日期 @@ -4889,7 +4914,7 @@ } } //deptName是否为空 - window.location.href = "${path}/commCtr/exportBbSelExcel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo; + window.location.href = "${path}/commCtr/exportBbSelExcel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+ "&remark=" + remark; }); //导出当前科室超期excel功能 @@ -4963,8 +4988,9 @@ return; } } + var remark=""+$("#overdue2").val(); //deptName是否为空 - window.location.href = "${path}/commCtr/exportBbSel2Excel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo; + window.location.href = "${path}/commCtr/exportBbSel2Excel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+ "&remark=" + remark; }); var zNodes = []; diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp index 6d49547f..786789d3 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -138,7 +138,7 @@
- +
<%--
@@ -231,7 +231,7 @@
- +
<%--