Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java =================================================================== diff -u -r17643 -r18008 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 17643) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 18008) @@ -18,6 +18,7 @@ import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.disinfectsystem.entity.basedatamanager.operationRoom.OperationRoom; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation; @@ -247,6 +248,7 @@ } String condition = String.format(" po.deliverStatus in('%s','%s') and %s", InvoicePlan.DELIVERSTATUS_AWAITDELIVER,InvoicePlan.DELIVERSTATUS_PARTDELIVERED,departPredicate); + condition += " and committedStatus=true and operatingRoom in (select operationRoomName from "+ OperationRoom.class.getSimpleName() +" where isInvoice='"+ Constants.STR_YES +"') order by id desc"; return getByHql(condition); }