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");