Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java =================================================================== diff -u -r40580 -r40589 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 40580) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 40589) @@ -217,10 +217,10 @@ inProgressPackageStatus.add(TousseItem.PACKAGE_STATUS_USED); inProgressPackageStatus.add(TousseItem.PACKAGE_STATUS_AWAIT_SECOND_RECEIVE); inProgressPackageStatus.add(TousseItem.PACKAGE_STATUS_TOBERETURNED); - if(StringUtils.equals(queryStatus, QUERY_STATUS_FINISHED)){ + if(queryStatus.contains(QUERY_STATUS_FINISHED)){ //已完成 状态为:“再次翻包申请、已归还、提前归还、终止的外来器械申请单”视为已完成 sqlBuilder.append(" and (not exists(select 1 from po.applicationItems tis where " + SqlUtils.getStringFieldInLargeCollectionsPredicate("packageStatus", inProgressPackageStatus) + ") or po.endStatus = '" + InvoicePlan.STATUS_END + "') "); - }else if(StringUtils.equals(queryStatus, QUERY_STATUS_IN_PROGRESS)){ + }else if(queryStatus.contains(QUERY_STATUS_IN_PROGRESS)){ //进行中 状态为: 除了再次翻包申请、已归还、提前归还、终止外的所有外来器械申请单 sqlBuilder.append(" and (exists(select 1 from po.applicationItems tis where " + SqlUtils.getStringFieldInLargeCollectionsPredicate("packageStatus", inProgressPackageStatus) + ") and (po.endStatus = '" + InvoicePlan.STATUS_PART_END + "' or po.endStatus is null)) "); }