Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java =================================================================== diff -u -r39539 -r39544 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 39539) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 39544) @@ -782,17 +782,9 @@ String tousseStatusSql = String.format(" and ((po.status in ('%s','%s') and case when po.invoice2_id is not null then po.location_2 else po.location end = '%s') %s) ", TousseInstance.STATUS_STERILED, TousseInstance.STATUS_SIGNED, orgUnitCoding, firstOrSecondSupplyRoomSql); - //SSTS-729 【告警管理】告警弹窗新增默认查询时间范围 - String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("tousseGoodsWarning")); - String validUntilSql = null; - if(defaultQueryStartDateAndEndDateArray != null){ - validUntilSql = String.format(" po.validUntil between '%s' and '%s' ",defaultQueryStartDateAndEndDateArray[0] + " 00:00:00", defaultQueryStartDateAndEndDateArray[1] + " 23:59:59"); - }else{ - validUntilSql = " 1=1 "; - } String sql = null; sql = "select count(1) A from " + TousseInstance.class.getSimpleName() + " po join " + TousseDefinition.class.getSimpleName() + " td on po.tousseDefinition_id = td.id " - + " where "+ validUntilSql +" and po.validUntil > " + + " where po.validUntil > " + dateQueryAdapter.dateAdapter(nowDateForValidUtil) + " and po.warningUntil < " + dateQueryAdapter.dateAdapter(nowDateForWarningUtil)