From ac9f12fef5f0688243db64075060cde612152638 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Wed, 14 Dec 2022 14:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=98=BE=E7=A4=BA20=E6=9D=A1=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/service/ipml/Archive_MasterServiceImpl.java    | 1 -
 src/main/resources/mapper/Archive_MasterMapper.xml              | 2 +-
 src/main/webapp/static/js/hospitalCommom/hospitalCommom.js      | 2 +-
 src/main/webapp/static/json/dictionary.json                     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

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 237e950..3b7514c 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -86,7 +86,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //设置查询条件审核角色
         setInfoId(archiveMasterVo);
         //设置登录用户
-        System.out.println(archiveMasterVo.getDeptName());
         Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
         if(user.getRoleId() != -100 && user.getRoleId() != 0 ){
             archiveMasterVo.setUserName(user.getUserName());
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 3581710..9216f39 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -712,7 +712,7 @@
                     <include refid="leaveHospitalCommomSearch"></include>
             </if>
             ) archive_master
-        ORDER BY archive_master.discharge_date_time desc
+        ORDER BY archive_master.dept_name,archive_master.discharge_date_time desc
     </select>
 
     <!---出院-->
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index 5960386..bcb5425 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1143,7 +1143,7 @@ function initTable5(data,sidePagination) {
         paginationShowPageGo: true,
         pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
         smartDisplay: false,
-        pageSize: 10, // 页面数据条数
+        pageSize: 20, // 页面数据条数
         pageNumber: 1, // 初始化加载第一页，默认第一页
         sidePagination: sidePagination, // 设置为服务器端分页     客户端：client
         search: false,
diff --git a/src/main/webapp/static/json/dictionary.json b/src/main/webapp/static/json/dictionary.json
index 61d273a..24549d4 100644
--- a/src/main/webapp/static/json/dictionary.json
+++ b/src/main/webapp/static/json/dictionary.json
@@ -5,7 +5,7 @@
     "type": "otherExtSysFlag"
   },
   {
-    "code": 2,
+    "code": 15,
     "name": "电子病历",
     "type": "otherExtSysFlag"
   },