From 989358a4b2cedab87a94a8a7fe6a05c10aaa13d9 Mon Sep 17 00:00:00 2001 From: "jian.wang" <824612544@qq.com> Date: Fri, 17 May 2024 11:31:25 +0800 Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E4=BF=AE=E6=94=B9pdf=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=A9=BA=E7=99=BD=E5=92=8C=E5=9B=BE=E5=83=8F=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=95=8C=E9=9D=A2=E4=B8=8A=E6=96=B0=E5=A2=9E=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=9B=BE=E5=83=8F=E4=B8=8A=E4=BC=A0=E6=8A=A5=E9=94=99?= =?UTF-8?q?=20bug=EF=BC=9A=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E6=8A=8A?= =?UTF-8?q?=E7=9B=98=E5=8F=B7=E6=94=BE=E7=97=85=E6=A1=88=E5=8F=B7=E5=89=8D?= =?UTF-8?q?=20bug=EF=BC=9A=E4=B8=8B=E8=BD=BD=E5=90=AF=E7=94=A8=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=B0=B4=E5=8D=B0=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=90=A6?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=8B=E8=BD=BD=E7=9A=84pdf?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E6=9C=89=E6=B0=B4=E5=8D=B0=EF=BC=8C=E8=AF=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88=20bug:=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2:=E4=B8=8D=E8=83=BD=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=87=AA=E9=80=89=EF=BC=8C=E5=89=8D=E4=B8=AD=E5=90=8E=E5=9D=87?= =?UTF-8?q?=E5=8F=AF=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20bug:=E7=97=85?= =?UTF-8?q?=E6=A1=88=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?:=E7=97=85=E6=A1=88=E5=8F=B7=20=E5=A7=93=E5=90=8D=20=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=20=E5=87=BA=E9=99=A2=E6=97=A5=E6=9C=9F=20=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E8=AF=8A=E6=96=AD=E5=90=8D=E7=A7=B0=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20bug:=E7=97=85=E4=BE=8B=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E8=B6=85=E8=BF=87300=E5=A4=9A=E9=A1=B5=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=8B=E8=BD=BD=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templateSearch/TemplateSearchController.java | 4 +++- src/main/java/com/emr/service/CommomService.java | 13 ++++++++----- .../recordManage/commomSearch/commomListqf.jsp | 2 +- .../commomSearch/showRecordIframeBlood.js | 1 + .../templateSearch/searchCommomMethodqf.js | 7 +++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java index 1dc36ac..d56b0c5 100644 --- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java +++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java @@ -1085,6 +1085,7 @@ public class TemplateSearchController { ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); //导出excel的操作 exportExcelUtil.expordExcel(tableThNames, fieldCns, list, fileName, response); + //CommonExcelExportUtil.exportExcel(list); } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); @@ -1335,7 +1336,8 @@ public class TemplateSearchController { } List scanPathList = vo.getScanPathList(); //每个文件名 - String fileName = vo.getInpatientNo().trim() + "-" + vo.getName().trim() + "-" + disDate.trim() + "_" + fmt.format(new Date()); + String name = java.net.URLEncoder.encode(vo.getName(), "UTF-8"); + String fileName = vo.getInpatientNo().trim() + "-" + name.trim() + "-" + disDate.trim() + "_" + fmt.format(new Date()); zos.putNextEntry(new ZipEntry(fileName + ".pdf")); //合成pdf out = new ByteArrayOutputStream(); diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index cbffc22..3a0a333 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -661,7 +661,8 @@ public class CommomService { } else { //需要水印 //组织加水印后图片存放目录 - String waterPicRoot = WATERPICPATH + patientId + File.separator + sourceList[i] + File.separator; + String waterPicRoot = WATERPICPATH + patientId + File.separator + sourceList[i] + File.separator;//D:/jiashi/reload/patientId/1/ + //目录不存在则创建 if (!new File(waterPicRoot).isDirectory()) { new File(waterPicRoot).mkdirs(); @@ -680,6 +681,7 @@ public class CommomService { //组织输出地址 String root = selectRootByNotWater(WATERPICPATH); outSrc = EMRRECORDJSP + File.separator + root + "/jiashi/reload/" + patientId + File.separator + sourceList[i] + File.separator + nameList[i]; + //http://192.168.199.124:8080/emr_record/reloadD\/jiashi/reload/patientId/1/ } } else { //不需要水印 @@ -707,11 +709,12 @@ public class CommomService { } else { //将原图片地址转换成映射地址 //获取盘符并转换映射地址的头部地址 - root = selectRootByNotWater(srcPath); + //root = selectRootByNotWater(srcPath); //获取盘符后面的地址 - String str1 = srcPath.substring(0, srcPath.indexOf(File.separator)); - picPath = srcPath.substring(str1.length() + 1, srcPath.length()); - outSrc = EMRRECORDJSP + File.separator + root + picPath; + // String str1 = srcPath.substring(0, srcPath.indexOf(File.separator)); + //picPath = srcPath.substring(str1.length() + 1, srcPath.length()); + //outSrc = EMRRECORDJSP + File.separator + root + picPath; + outSrc = "\\"+ picPath; } } outs.add(outSrc); 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 07b9b9c..7302be5 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -229,7 +229,7 @@ value="盘号,病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,其他诊断,病理诊断,损伤中毒,是否有手术,病案备注"> + value="commomtable.ph,commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.home_addr,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.other_diag_name,commomtable.pathology_name,commomtable.poisoning_name,commomtable.is_oper,memo,commomtable.file_source"> diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js index 0d84cf8..15c7229 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js @@ -51,6 +51,7 @@ var menu = { }else{ if(data[1] != undefined ){ scanPages = data[1].assortName; + $("#sources").val('1'); } } $.fn.zTree.init($("#ztree"), menu.setting, data); diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index 162fedd..bb0d75d 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -327,9 +327,9 @@ function freshTable(){ function exportExcel() { getChecked(); var checks = $("#checks").val(); - if ($("#rows").val() > 5000 && checks == '') { - toastr.warning("数据量大,暂提供5000条以内数据导出!"); - } else { + // if ($("#rows").val() > 5000 && checks == '') { + // toastr.warning("数据量大,暂提供5000条以内数据导出!"); + // } else { getSql(); var tableThNames = $("#tableThNames").val(); var fieldCns = $("#fieldCns").val(); @@ -365,7 +365,6 @@ function exportExcel() { } }) } - } } function btn(){ var url = path + "/printInfoList/pageUI174";