From d6d19e01fae2bdc782a4d73be6efc052bdbc3a19 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 15 Apr 2020 10:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BDpdf?=
 =?UTF-8?q?=E7=9A=84pdf=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/templateSearch/TemplateSearchController.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index 169b120..4035fdd 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -1226,7 +1226,8 @@ public class TemplateSearchController {
                     disDate = fmt.format(vo.getDisDate());
                 }
                 List<String> scanPathList = vo.getScanPathList();
-                String fileName = vo.getInpatientNo() + "_" + vo.getName() + "_" + disDate + "("+fmt.format(new Date())+")";         //每个文件名
+                //每个文件名
+                String fileName = vo.getInpatientNo() + "-" + vo.getName() + "-" + disDate + "_"+fmt.format(new Date());
                 zos.putNextEntry(new ZipEntry(fileName+".pdf"));
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                 //合成pdf
@@ -1376,7 +1377,8 @@ public class TemplateSearchController {
                     if(null != vo.getDisDate()){
                         disDate = fmt.format(vo.getDisDate());
                     }
-                    String pdfName = vo.getInpatientNo() + "_" + vo.getName() + "_" + disDate + "("+fmt.format(new Date())+")";//每个文件名
+                    //每个文件名
+                    String pdfName = vo.getInpatientNo() + "-" + vo.getName() + "-" + disDate + "_"+fmt.format(new Date());
                     //emrPdfWaterSet设置启用下载的状态
                     emrPdfWaterSet.setEffective(emrPdfWaterSet.getDownloadEffective());
                     emrPdfWaterSet.setIsImg(emrPdfWaterSet.getDownloadIsImg());