From 09c4796afcf912aeb94f5f6406fc9ea1605ed492 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 16 Jul 2025 12:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BD=AE=E5=B7=9E=E4=BA=BA=E5=8C=BB=E5=B8=B8?=
 =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E4=B8=8B=E8=BD=BDPDF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BD=8F=E9=99=A2=E5=8F=B7=E5=90=8E=E6=9C=89?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E5=8E=BB=E6=8E=89=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/templateSearch/TemplateSearchController.java | 2 +-
 src/main/java/com/emr/util/Jpg2PdfUtil.java                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index 5dfcf4e..8529add 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -1596,7 +1596,7 @@ public class TemplateSearchController {
                         SimpleDateFormat targetFormat = new SimpleDateFormat("yyyyMMdd");
                         Date date = originalFormat.parse(merInfo.get(0).getDisDate());
                         String formattedDate = targetFormat.format(date);
-                        String filename = hospitaInfo+ "_" +merInfo.get(0).getInpatientNo()+ "_" + formattedDate.format(formattedDate);
+                        String filename = hospitaInfo+ "_" +merInfo.get(0).getInpatientNo().trim()+ "_" + formattedDate.format(formattedDate);
                         Jpg2PdfUtil.mulFile2One3(response, filePaths, filename);
                     }
                 }
diff --git a/src/main/java/com/emr/util/Jpg2PdfUtil.java b/src/main/java/com/emr/util/Jpg2PdfUtil.java
index de8e250..56be938 100644
--- a/src/main/java/com/emr/util/Jpg2PdfUtil.java
+++ b/src/main/java/com/emr/util/Jpg2PdfUtil.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.io.*;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Iterator;
@@ -309,6 +310,7 @@ public class Jpg2PdfUtil {
             Document document = null;
             PdfCopy copy = null;
             try {
+                filename = URLEncoder.encode(filename, "UTF-8");
                 response.reset();
                 response.setCharacterEncoding("utf-8");
                 response.setContentType("application/pdf");