Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java =================================================================== diff -u -r16631 -r16778 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 16631) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 16778) @@ -625,7 +625,7 @@ + " and po.orgUnitCoding = '" + orgUnitCoding + "'"; }else{ - sql += " and (po.status = '已审核' or po.status = '已装配') and " + + sql += " and (po.status = '已审核') and " + "po.validUntil is not null and po.orgUnitCoding = '" + orgUnitCoding + "' "; }