From 2e88af4bf17a76194eb1bf905fe3791fd614fa37 Mon Sep 17 00:00:00 2001 From: hujl Date: Fri, 7 Jan 2022 16:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E7=97=85=E6=A1=88?= =?UTF-8?q?=E7=A4=BA=E8=B8=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/unfileMedicalController.java | 2 +- .../views/unfileMedicalDir/unfileMedicalList.jsp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/emr/controller/unfileMedicalController.java b/src/main/java/com/emr/controller/unfileMedicalController.java index 630c399d..41850fff 100644 --- a/src/main/java/com/emr/controller/unfileMedicalController.java +++ b/src/main/java/com/emr/controller/unfileMedicalController.java @@ -53,7 +53,7 @@ public class unfileMedicalController { public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); String[] header = {"病历清单id","住院号","住院次数","名字","性别","身份证","入院科室","入院日期","出院科室","出院日期","主管医生","状态","医生是否提交","医生","医生提交日期","护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡"}; - String[] fileNames = {"id,inpNo","visitId","name","sex","idNo","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag"}; + String[] fileNames = {"id","inpNo","visitId","name","sex","idNo","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag"}; //文件名 String fileName = "未归档病历列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据 diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 96cec680..b35785bf 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -4060,11 +4060,7 @@ //导出excel功能 $("#excelBtn").click(function () { - //var id = "" + $("#id").val(); - var inpNo = "" + $("#inpNo").val(); - var visitId = "" + $("#visitId").val(); - var name = "" + $("#name").val(); - // var url = window.location.href; + // var url = window.location.href; // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); // if (deptName != null && deptName != '') { // deptName += "," + $("#deptName").val(); @@ -4077,6 +4073,9 @@ } else { deptName = $("#deptName").val().toString(); } + var inpNo = "" + $("#inpNo").val(); + var visitId = "" + $("#visitId").val(); + var name = "" + $("#name").val(); var deptAdmissionTo = $("#deptAdmissionTo").val(); if (deptAdmissionTo.indexOf("") != -1) { deptAdmissionTo = ""; @@ -4091,6 +4090,7 @@ var bedNumber = $("#bedNumber").val(); var deathFlag = $("#deathFlag").val(); var printNum = $("#printNum").val(); + window.location.href = "${path}/unfile/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo + "&archivestate=" + archivestate + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&startDate=" + startDate + "&endDate=" + endDate