Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java =================================================================== diff -u -r16675 -r16695 --- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 16675) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 16695) @@ -327,19 +327,24 @@ } } } - //去掉按器械包状态的验证 - /*ListIterator it = instances.listIterator(); + //按器械包状态的验证过滤 + ListIterator it = instances.listIterator(); while (it.hasNext()) { TousseInstance instance = it.next(); - if (!TousseInstance.STATUS_SHIPPED.equals(instance + /*if (!TousseInstance.STATUS_SHIPPED.equals(instance .getStatus())) { if (!TousseInstance.STATUS_STERILED.equals(instance .getStatus())) { // 既不是已发货,也不是已灭菌,那就干掉他 it.remove(); } + }*/ + if(TousseInstance.STATUS_RECALLED.equals(instance.getStatus()) || TousseInstance.STATUS_WAIT_FOR_RECALL.equals(instance + .getStatus())){ + // 如果包状态是已召回或者待召回,需要过滤掉 + it.remove(); } - }*/ + } return instances; } }