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