From e90f092a28ad802f1199b3a070f318d3522ee503 Mon Sep 17 00:00:00 2001
From: hujl <hujl@126.com>
Date: Fri, 7 Jan 2022 17:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=87=BA=E9=99=A2?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/beHospitaledController.java    |  4 +-
 .../views/beHospitaledDir/beHospList.jsp      | 39 ++++++++-----------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index 1e1fb7a2..055598ef 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -74,8 +74,8 @@ public class beHospitaledController {
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印"};
-        String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum"};
+        String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印","状态"};
+        String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum","archivestate"};
         //文件名
         String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据beHospList
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 98bbb208..bad3d381 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -3783,8 +3783,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();
@@ -3794,7 +3794,7 @@
                     // if ($("#deptName").val() != null && $("#deptName").val() != "") {
                     //     deptName = $("#deptName").val();
                     // }
-
+                    var deptName="";
                     var len = ($("#deptName").val()).length;
                     if (len > 0) {
                         var deptNameT = $("#deptName").val();
@@ -5102,20 +5102,7 @@
 
     //导出excel功能
     $("#excelBtn").click(function () {
-        var id = "" + $("#id").val();
-        var inpNo = "" + $("#inpNo").val();
-        var visitId = "" + $("#visitId").val();
-        var name = "" + $("#name").val();
-        var idNo = "" + $("#idNo").val();
-        //var state = "" + $("#state").val();
-        var archivestate = "" + $("#archivestate").val();
-        // var deptName=""+$("#deptName").val();
-        var startDateTo = $("#startDateTo").val();
-        var endDateTo = $("#endDateTo").val();
-        var printNum = $("#printNum").val();
-        var url = window.location.href;
-        var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-
+        var deptName="";
         var len = ($("#deptName").val()).length;
         if (len > 0) {
             var deptNameT = $("#deptName").val();
@@ -5123,14 +5110,20 @@
                 deptName = $("#deptName").val().toString();
             }
         }
-        var emrCmit = $("#emrCmit").val();
         var doctorInCharge = $("#doctorInCharge").val().toString();
+        var inpNo = "" + $("#inpNo").val();
+        var visitId = "" + $("#visitId").val();
+        var name = "" + $("#name").val();
+        var archivestate = "" + $("#archivestate").val();
+        var emrCmit = $("#emrCmit").val();
+        var startDateTo = $("#startDateTo").val();
+        var endDateTo = $("#endDateTo").val();
+        var bedNumber=$("#bedNumber").val();
+        var printNum=$("#printNum").val();
 
-        var bedNumber = $("#bedNumber").val();
-
-        window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
-            "&name=" + name + "&archivestate=" + archivestate + "&deptName=" + deptName + "&emrCmit=" + emrCmit
-            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&doctorInCharge=" + doctorInCharge + "&bedNumber=" + bedNumber + "&printNum=" + printNum;
+        window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&archivestate=" + archivestate
+            + "&deptName=" + deptName + "&emrCmit=" + emrCmit  + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
+            + "&doctorInCharge=" + doctorInCharge + "&bedNumber=" + bedNumber + "&printNum=" + printNum;
 
     });