Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r14118 -r14139 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 14118) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 14139) @@ -131,6 +131,7 @@ import com.forgon.tools.SpringBeanManger; import com.forgon.tools.SqlBuilder; import com.forgon.tools.date.DateTools; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.DateJsonValueProcessor; import com.forgon.tools.json.JSONUtil; @@ -1656,6 +1657,15 @@ .isTousseStatusCorrect(tousseInstance); } }; + + Predicate unTraceableToussePredicate = new Predicate() { + @Override + public boolean evaluate(TousseInstance tousseInstance) { + return tousseInstanceManager + .isTousseStatusCorrect(tousseInstance) + && !DatabaseUtil.isPoIdValid(tousseInstance.getReviewBasket_id()); + } + }; Collection resultTousseInstanceList; TousseInstance tousseInstance = (TousseInstance) barcodeDevice; @@ -1689,7 +1699,7 @@ // 非可追溯器械包,返回多个器械包实例 resultTousseInstanceList = tousseInstanceManager .getUnTraceableTousseInstanceListByFictitiousTousseDefinition( - tousseDefinition, sqlWheres, predicate1); + tousseDefinition, sqlWheres, unTraceableToussePredicate); } else { if (!predicate1.evaluate(tousseInstance)) { return JSONUtil.buildErrorMsgJsonResult("器械包状态异常:"