diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java
index e0ad196..a3e12a7 100644
--- a/src/main/java/com/emr/controller/inHospitalController.java
+++ b/src/main/java/com/emr/controller/inHospitalController.java
@@ -345,19 +345,7 @@ public class inHospitalController {
         //根据所有id获取PDF列表
         try {
             List<Archive_Detail> arList = archiveDetailService.selectByIdStr(detail);
-            //获取废除的pdf文件名列表archive_detail
-            List pdfList = new ArrayList();
-            //将所有记录的pdf数组里面\static\img\pdfFiles\typesPdf
-            if(arList!=null && arList.size()>0){
-                for (Archive_Detail detail1 : arList) {
-                    String str = detail1.getPdfPath();
-                    if (StringUtils.isNotBlank(str)) {
-                        pdfList.add(str);
-                    }
-                }
-                //对所有地址的pdf进行合成
-                Jpg2PdfUtil.mulFile2One(response,pdfList,pdfWater);
-            }
+            archiveDetailService.mulFile2OneById(response,pdfWater,arList);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             //e.printStackTrace();
diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index e0f6372..10cbb63 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -47,7 +47,6 @@ public class lastVerifyController {
     @ResponseBody
     @RequestMapping(value = "/lastVerifyList")
     public OffsetLimitPage lastVerifyList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) {
-        long start = System.currentTimeMillis();
         //判断是否是初始化查询，是初始化查询把开始结束时间置空
         if(isSearch == 0){
             archiveMasterVo.setStartDateTo(null);
@@ -55,8 +54,6 @@ public class lastVerifyController {
         }
         try {
             OffsetLimitPage offsetLimitPage = archiveMasterService.selectByLast(archiveMasterVo, offset, limit);
-            long end = System.currentTimeMillis();
-            System.out.println("用时:"+(end-start)/1000.0+"s");
             return offsetLimitPage;
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
diff --git a/src/main/java/com/emr/service/Archive_DetailService.java b/src/main/java/com/emr/service/Archive_DetailService.java
index 71158c4..b197e3f 100644
--- a/src/main/java/com/emr/service/Archive_DetailService.java
+++ b/src/main/java/com/emr/service/Archive_DetailService.java
@@ -81,7 +81,9 @@ public interface Archive_DetailService {
 
     List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(String patientId,String assortIds);
 
-    void selectPdfPathByIds(HttpServletResponse response, String detailIds, String masterId,String pdfWater);
+    void mulFile2OneById(HttpServletResponse response, String pdfWater, List<Archive_Detail> arList);
+
+    void selectPdfPathByIds(HttpServletResponse response, String detailIds, String masterId, String pdfWater);
 }
  
 
diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
index 541d0db..4a36d24 100644
--- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
@@ -79,39 +79,41 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
     public void getPdfToPdf(HttpServletResponse response, String imgStr, String masterId,String pdfWater) {
         if (StringUtils.isNotBlank(masterId)) {
             //获取废除的pdf文件名列表archive_detail
-            List pdfList = new ArrayList();
             Archive_Detail archiveDetail = new Archive_Detail();
             archiveDetail.setFlag("0");
             archiveDetail.setMasterid(masterId.trim());
             archiveDetail.setTitle(imgStr);
             List<Archive_Detail> arList = selectByCol(archiveDetail);
-            if (arList != null && !arList.isEmpty()) {
-                for (Archive_Detail detail : arList) {
-                    String str = detail.getPdfPath();
-                    if (StringUtils.isNoneBlank(str)) {
-                        pdfList.add(str);
-                    }
+            mulFile2OneById(response, pdfWater,arList);
+        }
+    }
+
+    /**
+     * 封装合成pdf方法
+     * @param response
+     * @param pdfWater
+     * @param arList
+     */
+    @Override
+    public void mulFile2OneById(HttpServletResponse response, String pdfWater, List<Archive_Detail> arList) {
+        List<String> pdfList =  new ArrayList<>();
+        if (arList != null && !arList.isEmpty()) {
+            for (Archive_Detail detail : arList) {
+                String str = detail.getPdfPath();
+                if (StringUtils.isNoneBlank(str)) {
+                    pdfList.add(str);
                 }
             }
-            Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater);
         }
+        Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater);
     }
 
     @Override
     public void selectPdfPathByIds(HttpServletResponse response, String detailIds, String masterId,String pdfWater) {
         if (StringUtils.isNotBlank(masterId)) {
             //获取废除的pdf文件名列表archive_detail
-            List pdfList = new ArrayList();
             List<Archive_Detail> arList = archiveDetailMapper.selectPdfPathByIds(masterId,detailIds);
-            if (arList != null && !arList.isEmpty()) {
-                for (Archive_Detail detail : arList) {
-                    String str = detail.getPdfPath();
-                    if (StringUtils.isNoneBlank(str)) {
-                        pdfList.add(str);
-                    }
-                }
-            }
-            Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater);
+            mulFile2OneById(response, pdfWater,arList);
         }
     }
 
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 106ca3f..962ffbc 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -69,7 +69,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Master_Vo> list = selectByColumn(archiveMasterVo);
-        long start = System.currentTimeMillis();
         //组织完整性字段
         //list集合的分组分类集合
         if(!CollectionUtils.isEmpty(list)){
@@ -83,8 +82,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 updateMasterBySuccess(list, details, assortList);
             }
         }
-        long end = System.currentTimeMillis();
-        System.out.println("用时"+(end-start)/1000.0+"s");
         return new OffsetLimitPage((Page) list);
     }
 
diff --git a/src/main/java/com/emr/util/PDFUtils.java b/src/main/java/com/emr/util/PDFUtils.java
index 2d0c280..0c861dd 100644
--- a/src/main/java/com/emr/util/PDFUtils.java
+++ b/src/main/java/com/emr/util/PDFUtils.java
@@ -37,7 +37,6 @@ public class PDFUtils {
 //            e.printStackTrace();
 //        }
         String projectPath = System.getProperty("user.dir") + "\\static\\img\\pdfFiles\\typesPdf\\";
-        System.out.println("projectPath==" + projectPath);
         PDFUtils.delAllFile(projectPath);
     }
 
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index 05b88c7..7b03df8 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -70,7 +70,7 @@
     <if test="assortName != null and assortName != ''">
       and t.AssortID in (${assortName})
     </if>
-    ORDER BY z.assort_sort
+    ORDER BY z.assort_sort,t.UpLoadDateTime
   </select>
   <select id="selectByid" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -80,7 +80,7 @@
   </select>
   <select id="selectByIdStr" parameterType="com.emr.entity.Archive_Detail" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List"/>
+        PDF_PATH
     from archive_detail
     left join zd_assort
     on zd_assort.assort_id = archive_detail.AssortID
@@ -128,7 +128,7 @@
     order by UpLoadDateTime
   </select>
   <select id="selectByCol" parameterType="com.emr.entity.Archive_Detail" resultMap="BaseResultMap">
-      select d.*
+      select d.PDF_PATH
       from archive_detail d
       LEFT JOIN zd_assort z
       on d.AssortID=z.assort_id
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index a101e6b..c42718a 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -499,6 +499,7 @@ function DoOnCellHtmlData(cell, row, col, data) {
 var idArr = [];
 //文档列表
 function initTable2() {
+    $("#table2").bootstrapTable("destroy");
     $("#table2").bootstrapTable({ // 对应table标签的id
         //method: 'POST',
         url: path+"/inHosp/getAssortdetail", // 获取表格数据的url
diff --git a/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js b/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
index 555c3d9..d2e9beb 100644
--- a/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
+++ b/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
@@ -64,6 +64,7 @@ $('#searchBtn').click(function () {
         toastr.warning("正在查询，请稍等...");
     }
 });
+
 $("#pdfBtn").click(function () {
     //上传后预览pdf文件
     //生成pdf返回url
@@ -72,6 +73,7 @@ $("#pdfBtn").click(function () {
         var imgStr = "";
         var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id
         var changedNodes = zTree.getChangeCheckedNodes(); //获取改变的全部结点
+        debugger
         for (var i = 0; i < changedNodes.length; i++) {
             var treeNode = changedNodes[i];
             if (treeNode.id != 0) {
@@ -85,6 +87,7 @@ $("#pdfBtn").click(function () {
         }
         //打开一个不被拦截的新窗口
         var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/getPdfToPdf/"+masterId+"/"+imgStr;
+
         var openWin = window.open(pdfUrl,"_blank");
         setTimeout(function(){ openWin.document.title = $("#nameLab").text(); }, 100);
     } else {