Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java =================================================================== diff -u -r16957 -r16964 --- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java (.../RecallRecordAction.java) (revision 16957) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java (.../RecallRecordAction.java) (revision 16964) @@ -45,6 +45,7 @@ import com.forgon.disinfectsystem.recall.service.RecallRecordManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JsonPropertyFilter; import com.opensymphony.xwork2.ModelDriven; @@ -503,6 +504,10 @@ if (tis != null && tis.size() > 0) { List instances = tis; for (TousseInstance ti : instances) { + //聚合包内的普通包实例应该过滤掉不显示出来 + if(DatabaseUtil.isPoIdValid(ti.getComboTousseInstanceId())){ + continue; + } RecalledTousseVO tousseVO = new RecalledTousseVO(); tousseVO.setBarcode(ti.getBarcode()); if(record != null){