From 2df05143fbf391a037faccadf9ba909591c07dec Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 15 Apr 2020 17:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=BD=BDpdf?=
 =?UTF-8?q?=E7=9A=84pdf=E5=90=8D=E7=A7=B0=E5=AD=98=E5=9C=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=A9=BA=E6=A0=BC=E8=BD=AC=E4=B9=89=E6=88=90=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E9=94=81=E5=AE=9A=E5=88=97=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/templateSearch/TemplateSearchController.java   | 4 ++--
 src/main/resources/mapper/recordLock/Emr_LockMapper.xml       | 1 +
 2 files changed, 3 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 224a48c..ed749e6 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -1227,7 +1227,7 @@ public class TemplateSearchController {
                 }
                 List<String> scanPathList = vo.getScanPathList();
                 //每个文件名
-                String fileName = vo.getInpatientNo() + "-" + vo.getName() + "-" + disDate + "_"+fmt.format(new Date());
+                String fileName = vo.getInpatientNo().trim() + "-" + vo.getName().trim() + "-" + disDate.trim() + "_"+fmt.format(new Date());
                 zos.putNextEntry(new ZipEntry(fileName+".pdf"));
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                 //合成pdf
@@ -1378,7 +1378,7 @@ public class TemplateSearchController {
                         disDate = fmt.format(vo.getDisDate());
                     }
                     //每个文件名
-                    String pdfName = vo.getInpatientNo() + "-" + vo.getName() + "-" + disDate + "_"+fmt.format(new Date());
+                    String pdfName = vo.getInpatientNo().trim() + "-" + vo.getName().trim() + "-" + disDate.trim() + "_"+fmt.format(new Date());
                     //emrPdfWaterSet设置启用下载的状态
                     emrPdfWaterSet.setEffective(emrPdfWaterSet.getDownloadEffective());
                     emrPdfWaterSet.setIsImg(emrPdfWaterSet.getDownloadIsImg());
diff --git a/src/main/resources/mapper/recordLock/Emr_LockMapper.xml b/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
index d5f1639..84e0c4b 100644
--- a/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
+++ b/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
@@ -227,5 +227,6 @@
                 </if>
             </if>
         </where>
+        ORDER BY emr_lock.locke_time desc
     </select>
 </mapper>
\ No newline at end of file