From 7edf37a19cbc62581ef452394e99acdf0eb40f9e Mon Sep 17 00:00:00 2001 From: hujl <123@qq.com> Date: Fri, 16 Apr 2021 16:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=A1=88=E6=B5=8F=E8=A7=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/emr/controller/FontController.java | 13 +++++++++++-- .../service/ipml/Archive_DetailServiceImpl.java | 1 + src/main/java/com/emr/util/ExceptionPrintUtil.java | 14 -------------- src/main/resources/mapper/Archive_DetailMapper.xml | 2 +- .../WEB-INF/views/beHospitaledDir/beHospList.jsp | 2 +- .../webapp/WEB-INF/views/commitDir/commitList.jsp | 3 ++- .../WEB-INF/views/inHospitalDir/inHositalList.jsp | 2 +- .../WEB-INF/views/lastVerifyDir/lastVerifyList.jsp | 2 +- src/main/webapp/WEB-INF/views/pdfDir/pdfDir.jsp | 4 ++-- .../views/unfileMedicalDir/unfileMedicalList.jsp | 2 +- 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 2958f167..c565e148 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.text.ParseException; @@ -52,7 +53,9 @@ public class FontController { * 提供第三方按多个分段id和记账号查询病历pdf * */ @RequestMapping("showRecordByPatientId") - public String showRecordByPatientId(String assortIds, String patientId,String visitId, Model model){ + public String showRecordByPatientId( HttpServletResponse response, String assortIds, String patientId, String visitId, Model model){ + response.setCharacterEncoding("utf-8"); + System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式 if(StringUtils.isBlank(assortIds)){ return retrunErrorPage(model,"病案分类Id不能为空!"); } @@ -95,6 +98,7 @@ public class FontController { * 返回错误页面 * */ private String retrunErrorPage(Model model, String errorMsg){ + System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式 model.addAttribute("errorMsg",errorMsg); return "font/error"; } @@ -103,6 +107,7 @@ public class FontController { * 判断分类id是否存在 * */ private String checkAssortIds(String assortIds){ + System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式 Zd_Assort assort = new Zd_Assort(); assort.setPrintFlag("0"); List assortList = null; @@ -187,7 +192,9 @@ public class FontController { */ @ResponseBody @RequestMapping(value = "/getRecordTypeTree") - public String getRecordTypeTree(String patientId,String assortIds){ + public String getRecordTypeTree(HttpServletResponse response,String patientId,String assortIds){ + response.setCharacterEncoding("utf-8"); + System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式 List treeList = new ArrayList<>(); if(StringUtils.isNotBlank(patientId) && StringUtils.isNotBlank(assortIds)){ List list = new ArrayList<>(); @@ -328,6 +335,7 @@ public class FontController { @ResponseBody @RequestMapping(value = "/getPdfToPdf",method = RequestMethod.POST) public Msg getPdfToPdf(HttpServletResponse response, String detailIds, HttpSession session){ + response.setCharacterEncoding("utf-8"); try { Archive_Detail detail = new Archive_Detail(); if(StringUtils.isNotBlank(detailIds)){ @@ -348,6 +356,7 @@ public class FontController { @ResponseBody @RequestMapping(value = "showPdf") public void showPdf(HttpServletResponse response, HttpSession session){ + response.setCharacterEncoding("utf-8"); try { archiveDetailService.showPdf(response,session,pdfWater); } catch (Exception e) { diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index 5bac556e..31f1a98e 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -114,6 +114,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { */ @Override public List mulFile2OneById(HttpServletResponse response,List arList) { + response.setCharacterEncoding("utf-8"); List pdfList = new ArrayList<>(); if (arList != null && !arList.isEmpty()) { //TODO 抽取首次病程记录 diff --git a/src/main/java/com/emr/util/ExceptionPrintUtil.java b/src/main/java/com/emr/util/ExceptionPrintUtil.java index d1003b34..32947643 100644 --- a/src/main/java/com/emr/util/ExceptionPrintUtil.java +++ b/src/main/java/com/emr/util/ExceptionPrintUtil.java @@ -1,27 +1,13 @@ package com.emr.util; import org.apache.log4j.Logger; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; -/** - * @ProjectName: - * @Description: - * @Param 传输参数 - * @Return - * @Author: 曾文和 - * @CreateDate: 2020/8/4 14:18 - * @UpdateUser: 曾文和 - * @UpdateDate: 2020/8/4 14:18 - * @UpdateRemark: 更新说明 - * @Version: 1.0 - */ public class ExceptionPrintUtil { private static Logger log = Logger.getLogger("errorMsg"); public static void printException(Exception e){ - //方法名 ByteArrayOutputStream baos = new ByteArrayOutputStream(); e.printStackTrace(new PrintStream(baos)); String exception = baos.toString(); diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index fd5e83da..2a93f343 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -126,7 +126,7 @@ from archive_detail left join zd_assort on zd_assort.assort_id = archive_detail.AssortID - where 1=1 and flag=0 + where 1=1 and flag='0' and id in (${title}) diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index afdf67b5..6e40bfd9 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -1749,10 +1749,10 @@ if (fileList[j].name == filename) { fileList.splice(j, 1); id--; + files = fileList; break; } } - files = fileList; } /** diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index c177723f..31b2b044 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -1510,10 +1510,11 @@ if (fileList[j].name == filename) { fileList.splice(j, 1); id--; + files = fileList; break; } } - files = fileList; + } /** diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 2cadc73a..0c757c70 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -1376,11 +1376,11 @@ //通过图片名判断图片在数组中的位置然后删除 if (fileList[j].name == filename) { fileList.splice(j, 1); + files = fileList; id--; break; } } - files = fileList; } /** diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index db132db2..f44c72be 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -1379,10 +1379,10 @@ if (fileList[j].name == filename) { fileList.splice(j, 1); id--; + files = fileList; break; } } - files = fileList; } /** diff --git a/src/main/webapp/WEB-INF/views/pdfDir/pdfDir.jsp b/src/main/webapp/WEB-INF/views/pdfDir/pdfDir.jsp index 91d2e4bf..e82539b1 100644 --- a/src/main/webapp/WEB-INF/views/pdfDir/pdfDir.jsp +++ b/src/main/webapp/WEB-INF/views/pdfDir/pdfDir.jsp @@ -206,10 +206,10 @@
- +
- +
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index bc7c5abf..1f7261a8 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -1540,10 +1540,10 @@ if (fileList[j].name == filename) { fileList.splice(j, 1); id--; + files = fileList; break; } } - files = fileList; } /**