From 29f38661a57cdb7311c8577ea794a253e9f73e92 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Wed, 9 Sep 2020 16:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E6=B5=8F=E8=A7=88=E5=88=B0?=
 =?UTF-8?q?=E5=A4=84excelurl=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=97=85=E5=8E=86=E6=B8=85=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/entity/Archive_Detail_Vo.java   |  4 ++++
 .../service/ipml/Archive_MasterServiceImpl.java  |  6 ------
 .../resources/mapper/Archive_DetailMapper.xml    | 10 +++++++++-
 .../webapp/static/js/beHospList/beHospList.js    | 16 +++++++++++++++-
 .../static/js/hospitalCommom/hospitalCommom.js   |  7 ++++---
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/emr/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java
index d3bbed2..e182d20 100644
--- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java
+++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java
@@ -25,6 +25,10 @@ public class Archive_Detail_Vo extends Archive_Detail{
     private Integer checker;
 
     private String assortId;
+
+    private String sort;
+
+    private String order;
 }
  
 
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 b2ff1e5..a6e98fa 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -230,15 +230,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     @Override
     public List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo) {
         setMaxRoleId(archiveMasterVo);
-        long start = System.currentTimeMillis();
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
-        long end = System.currentTimeMillis();
-        System.out.println("查询所需的时间"+(end-start)/1000.0+"s");
         //转换科室与赋值超期天数
-        long start1 = System.currentTimeMillis();
         selectByColumnChange(list);
-        long end1 = System.currentTimeMillis();
-        System.out.println("组织所需的时间"+(end1-start1)/1000.0+"s");
         //根据状态code转换状态及判断显示按钮
         if(null != list && !list.isEmpty()){
             //查询流转角色集合
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index 6329a8e..cddbbb4 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -76,7 +76,15 @@
     <if test="source != null and source != ''">
       and t.Source = #{source,jdbcType=VARCHAR}
     </if>
-    ORDER BY z.assort_sort,t.UpLoadDateTime
+    ORDER BY
+    <choose>
+      <when test="sort != null and sort != ''">
+        t.UpLoadDateTime ${order}
+      </when>
+      <otherwise>
+        z.assort_sort,t.UpLoadDateTime
+      </otherwise>
+    </choose>
   </select>
   <select id="selectByid" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index ab81583..8c9cc32 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -765,7 +765,21 @@ $("#excelBtn").click(function () {
     var status = $("#currentRoleIds").val();
     var role = $("#currentRole").val();
     var url = path+"/beHosp/exportExcel";
-    post(url,{"doctorInCharge":doctorInCharge,"inpNo":inpNo,"visitId":visitId,"name":name,"deptName":deptName,"startDateTo":startDateTo,"endDateTo":endDateTo,"isSearch":isSearch,"archivestate":archivestate,"status":status,"role":role});
+    post(url,{"doctorInCharge":doctorInCharge,
+        "inpNo":inpNo,
+        "visitId":visitId,
+        "name":name,
+        "deptName":deptName,
+        "startDateTo":startDateTo,
+        "endDateTo":endDateTo,
+        "isSearch":isSearch,
+        "archivestate":archivestate,
+        "status":status,
+        "role":role,
+        "roles":$("#searchOperRole").val(),
+        "isSuccess":$("#isSuccessSearch").val(),
+        "infoId":$("#infoId").val()
+    });
 });
 
 /**
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index 8ec7ee7..ac4ab50 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -551,6 +551,7 @@ function initTable2() {
         paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
         showHeader: true,//是否显示列头。
         trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+        sortable: true,
         queryParams: function (params) {
             var currPageSize = this.pageSize;
             if (currPageSize == 2) {
@@ -574,6 +575,7 @@ function initTable2() {
             var temp = {
                 limit: limit,     //页面大小
                 offset: offset,   //页码
+                sort:params.sort,
                 order: params.order,      //排位命令（desc，asc）
                 patientId: patientId,
                 assortId: assortId,
@@ -583,8 +585,6 @@ function initTable2() {
             };
             return temp;
         },
-        sortName: 'assortSort', // 要排序的字段
-        sortOrder: 'desc', // 排序规则
         columns: [{
             title: '全选',
             field: 'select',   //复选框
@@ -611,13 +611,14 @@ function initTable2() {
                 title: '标题',
                 field: 'title',
                 align: 'left',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '上传时间',
                 field: 'uploaddatetime',
                 align: 'left',
                 valign: 'middle',
+                sortable: true,
                 width: 150, // 定义列的宽度，单位为像素px
             },
             {