Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r14205 -r14206 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 14205) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 14206) @@ -154,7 +154,7 @@ */ public void autoWasteOutdateTousseInstances(){ List outdateTousseInstanceList = - objectDao.findByHql("from TousseInstance where validUntil > " + new Date()); + (List)objectDao.getHibernateSession().createQuery("from TousseInstance where not status in ('"+TousseInstance.STATUS_USED+"','"+TousseInstance.STATUS_RECYCLED+"','"+TousseInstance.STATUS_DISCARD+"') and validUntil < :validUntil").setDate("validUntil", new java.sql.Timestamp(new Date().getTime())).list(); if(CollectionUtils.isNotEmpty(outdateTousseInstanceList)){ //更新器械包库存 List goodsStockList = new ArrayList();