Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java =================================================================== diff -u -r13961 -r15229 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 13961) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 15229) @@ -152,8 +152,7 @@ + dateQueryAdapter.dateAdapter(date) + " and po.warningUntil < " + dateQueryAdapter.dateAdapter(date) - + " and po.location = '" + orgUnitCoding - + "' and po.departmentStock_id is not null "; + + " and po.location = '" + orgUnitCoding + "' "; sql += " and " + SqlBuilder.build_IN_Statement("po.status", SqlBuilder.IN, TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED); } @@ -181,8 +180,8 @@ }else {//二级供应室或临床科室 sql = "select count(*) B from TousseInstance po where po.location = '" + orgUnitCoding + "'" + " and po.validUntil < " - + dateQueryAdapter.dateAdapter(date) - + " and po.departmentStock_id is not null "; + + dateQueryAdapter.dateAdapter(date); +// + " and po.departmentStock_id is not null "; sql += " and " + SqlBuilder.build_IN_Statement("po.status", SqlBuilder.IN, TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED); }