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