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 97712c9..0054598 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -63,7 +63,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectByLast(Archive_Master_Vo archiveMasterVo) { - return archiveMasterMapper.selectByLast(archiveMasterVo); + + List list = archiveMasterMapper.selectByLast(archiveMasterVo); + //设置科室 + setDeptNameForList(list); + return list; } @Override @@ -130,14 +134,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } List paperPatiendIds = new ArrayList<>(); List callBackPatiendIds = new ArrayList<>(); - try { - //查询纸质签收和召回状态 - paperPatiendIds = this.selectPaperPatiendIdList(patientIdsBuilder.toString()); - callBackPatiendIds = this.selectCallBackPatiendIdList(patientIdsBuilder.toString()); - }catch (Exception e){ - e.printStackTrace(); - ExceptionPrintUtil.printException(e); - } +// try { +// //查询纸质签收和召回状态 +// paperPatiendIds = this.selectPaperPatiendIdList(patientIdsBuilder.toString()); +// callBackPatiendIds = this.selectCallBackPatiendIdList(patientIdsBuilder.toString()); +// }catch (Exception e){ +// e.printStackTrace(); +// ExceptionPrintUtil.printException(e); +// } //查询科室集合 Emr_Dictionary dictionary = new Emr_Dictionary(); dictionary.setTypecode("dept_code"); diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 7370919..4799aab 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -12,4 +12,7 @@ pdfWater = \u5E7F\u4E1C\u7701\u82F1\u5FB7\u5E02\u4EBA\u6C11\u533B\u9662 medicalRecordsRoomDeptId = 1315 #\u533B\u52A1\u79D1\u79D1\u5BA4\u7F16\u53F7 -medicalepartmentDeptId = 1145 \ No newline at end of file +medicalepartmentDeptId = 1145 + +#\u5B9A\u4E49\u7B2C\u4E09\u65B9\u6D4F\u89C8\u75C5\u5386\u7684\u67E5\u8BE2\u5168\u90E8\u5206\u7C7B\u7684\u5206\u7C7Bid\u53C2\u6570\u503C +allAddortIds = 00000000 \ No newline at end of file diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 1800a4b..080237d 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,16 +1,16 @@ #\u6570\u636E\u5E93IP -#dataBaseIp=localhost -###\u6570\u636E\u5E93\u540D\u79F0 +dataBaseIp=localhost +##\u6570\u636E\u5E93\u540D\u79F0 #dataBaseName=yd_record ##\u6570\u636E\u5E93\u5BC6\u7801 #dataBasePassword=docus702 #\u6570\u636E\u5E93IP -dataBaseIp=10.36.116.108 -#\u6570\u636E\u5E93\u540D\u79F0 -dataBaseName=emr_record +#dataBaseIp=10.36.116.108 +##\u6570\u636E\u5E93\u540D\u79F0 +dataBaseName=yd_record #\u6570\u636E\u5E93\u5BC6\u7801 -dataBasePassword=xjgs+docus911 +dataBasePassword=admin123 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} @@ -47,11 +47,11 @@ logAbandoned: true #\u56FE\u7247\u5730\u5740 pictureUrl=src\\main\\webapp -powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag -POWER_URLHEAD=http://localhost:8080/power -POWER_JSP=http://localhost:8080/power +powerUrl=http://localhost:8081/power/font/getMenusByUserIdAndSysFlag +POWER_URLHEAD=http://localhost:8081/power +POWER_JSP=http://localhost:8081/power recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 -HomepageDictionary=http://10.36.116.108:8080/WholeCheckInterface/services/HomepageDictionary?wsdl +HomepageDictionary=http://localhost:8080/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData diff --git a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js index c416f85..84d1b14 100644 --- a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js +++ b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js @@ -11,7 +11,7 @@ function initTable() { striped: true, //表格显示条纹,默认为false pagination: true, // 在表格底部显示分页组件,默认false paginationShowPageGo: true, - pageList: [5,10, 20, 50, 100], // 如果设置了分页,设置可供选择的页面数据条数。设置为All 则显示所有记录。 + pageList: [5,10, 20, 50, 100,500,1000], // 如果设置了分页,设置可供选择的页面数据条数。设置为All 则显示所有记录。 smartDisplay: false, pageSize: 2, // 页面数据条数 pageNumber: 1, // 初始化加载第一页,默认第一页