Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java =================================================================== diff -u -r14297 -r14548 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java (.../SterileLoadingManagerImpl.java) (revision 14297) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java (.../SterileLoadingManagerImpl.java) (revision 14548) @@ -24,14 +24,14 @@ public Collection getUnTraceableTousseInstanceList( final String departCode, final JSONObject extraParam, TousseDefinition tousseDefinition) { - Predicate unTraceableToussePredicate = new Predicate() { - @Override - public boolean evaluate(TousseInstance tousseInstance) { - return tousseInstanceManager - .isTousseStatusCorrect(tousseInstance) - && !DatabaseUtil.isPoIdValid(tousseInstance.getReviewBasket_id()); - } - }; +// Predicate unTraceableToussePredicate = new Predicate() { +// @Override +// public boolean evaluate(TousseInstance tousseInstance) { +// return tousseInstanceManager +// .isTousseStatusCorrect(tousseInstance) +// && !DatabaseUtil.isPoIdValid(tousseInstance.getReviewBasket_id()); +// } +// }; Collection resultTousseInstanceList; Collection sqlWheres = new ArrayList(); @@ -54,10 +54,11 @@ sqlWheres.add(SqlBuilder.build_IN_Statement( "po.barcode", SqlBuilder.NOT_IN, scannedBarcodes)); sqlWheres.add("po.status='" + TousseInstance.STATUS_REVIEWED + "'"); + sqlWheres.add("po.reviewBasket_id is null or po.reviewBasket_id = 0"); // 非可追溯器械包,返回多个器械包实例 resultTousseInstanceList = tousseInstanceManager.getUnTraceableTousseInstanceListByFictitiousTousseDefinition( - tousseDefinition, sqlWheres, unTraceableToussePredicate); + tousseDefinition, sqlWheres); return resultTousseInstanceList; } }