出院浏览到处excelurl增加查询条件，病历清单表格增加时间排序

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;
 }
  
 

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()){
             //查询流转角色集合

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 

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()
+    });
 });
 
 /**

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
             },
             {