Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r23404 -r23465 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23404) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23465) @@ -199,7 +199,7 @@ LoginUserData loginUserData = AcegiHelper.getLoginUser(); String currentOrgUnitCode = loginUserData.getCurrentOrgUnitCode(); String userName = loginUserData.getUserName(); - + //1.1.如果当前登录用户为外来器械供应商的申请人员时(对于外来器械申请单只查询该人员对应的供应商的申请单或无未配置申请人员的供应商的申请单、其它类型申请单业务不变) String foreignTousseAppFilterSql = ""; List supplierNameList = supplierManager.getSupplierNameListByTypeAndUserCode(Supplier.SUPPLIER_TYPE_RENTTOUSSE, loginUserData.getUserName()); @@ -240,11 +240,19 @@ //提交状态:committedStatus等于0 String commitSql = " (po.committedStatus = 0) "; - + + Date now = new Date(); //今天处理的单 - String todaySql = "po.lastInvoiceTime >= " + dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH)); + String todaySql = "po.lastInvoiceTime >= " + dateQueryAdapter.dateAdapter(DateUtils.truncate(now, Calendar.DAY_OF_MONTH)); - sqlBuilder.append(String.format(" and (%s or %s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, commitSql, todaySql)); + //判断是否需要显示当前终止的申请单 + boolean isShowEndedGoodsApplication = CssdUtils.getSystemSetConfigByNameBool("isShowEndedGoodsApplication", false); + String todayEndSql="1=0"; + if(isShowEndedGoodsApplication==true){ + //今天终止的单 + todayEndSql="po.applicationTime >="+dateQueryAdapter.dateAdapter(DateUtils.truncate(now, Calendar.DAY_OF_MONTH))+" and po.endStatus="+"'"+InvoicePlan.STATUS_END+"'"; + } + sqlBuilder.append(String.format(" and (%s or %s or %s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, commitSql, todaySql, todayEndSql)); } //4、其他一些条件的过滤 Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r23335 -r23465 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 23335) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 23465) @@ -23,7 +23,7 @@ "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", - "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18"}; + "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_oracle.sql (revision 23465) @@ -0,0 +1,20 @@ +declare + columnCount Number(10); +begin + select count(0) into columnCount from dba_tab_columns where owner=(select username from user_users) + and lower(table_name)='expensivegoodsapplication' + and lower(column_name)='patient'; + + if columnCount > 0 then + EXECUTE IMMEDIATE 'alter table expensivegoodsapplication drop column patient'; + end if; + + select count(0) into columnCount from dba_tab_columns where owner=(select username from user_users) + and lower(table_name)='expensivegoodsapplication' + and lower(column_name)='hospitalnumber'; + + if columnCount > 0 then + EXECUTE IMMEDIATE 'alter table expensivegoodsapplication drop column hospitalnumber'; + end if; + +end; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js =================================================================== diff -u -r22653 -r23465 --- ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js (.../config.js) (revision 22653) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js (.../config.js) (revision 23465) @@ -35,5 +35,7 @@ "closeFormDefinition" : false, "confirmRecyclingAmount" : false, "useRecordConvertRecyclingApplicationRemark" : "手术台数:@operationAmount;器械包数量:@tousseAmount", - "useRecordConvertRecyclingApplicationMergeRegular" : "operationRoom" + "useRecordConvertRecyclingApplicationMergeRegular" : "operationRoom", + //simon:科室申领列表是否显示当天已终止的申请单,默认为不显示 + "isShowEndedGoodsApplication":true } \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.18_4.9.19_sqlserver.sql (revision 23465) @@ -0,0 +1,13 @@ +IF EXISTS ( + SELECT 1 FROM SYSOBJECTS T1 + INNER JOIN SYSCOLUMNS T2 ON T1.ID=T2.ID + WHERE lower(T1.NAME)='expensivegoodsapplication' AND T2.NAME='patient' + ) + alter table expensivegoodsapplication drop column patient; + +IF EXISTS ( + SELECT 1 FROM SYSOBJECTS T1 + INNER JOIN SYSCOLUMNS T2 ON T1.ID=T2.ID + WHERE lower(T1.NAME)='expensivegoodsapplication' AND T2.NAME='hospitalNumber' + ) +alter table expensivegoodsapplication drop column hospitalNumber; \ No newline at end of file