Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java =================================================================== diff -u -r13842 -r13843 --- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 13842) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 13843) @@ -747,6 +747,7 @@ Map departCodeAndNameMap = new HashMap(); for (TousseInstance instance : shippedTousses) { String location = instance.getLocation(); + TousseDefinition td = instance.getTousseDefinition(); if (StringUtils.isNotBlank(location)) { Invoice invoice = invoiceManager.getInvoiceByTousseInstanceId(instance.getId().toString()); @@ -779,9 +780,8 @@ TousseItem item = new TousseItem(); item.setAmount(1); item.setDiposable("否"); - item.setTousseType(instance == null || instance.getTousseDefinition() == null ? TousseDefinition.PACKAGE_TYPE_INSIDE : instance.getTousseDefinition().getTousseType()); - item.setTousseDefinitionId(instance - .getTousseDefinition().getId()); + item.setTousseType(instance == null || td == null ? TousseDefinition.PACKAGE_TYPE_INSIDE : td.getTousseType()); + item.setTousseDefinitionId(td.getId()); item.setTousseName(instance.getTousseName()); items.add(item); } @@ -791,9 +791,8 @@ TousseItem item = new TousseItem(); item.setAmount(1); item.setDiposable("否"); - item.setTousseType(instance.getType()); - item.setTousseDefinitionId(instance - .getTousseDefinition().getId()); + item.setTousseType(instance == null || td == null ? TousseDefinition.PACKAGE_TYPE_INSIDE : td.getTousseType()); + item.setTousseDefinitionId(td.getId()); item.setTousseName(instance.getTousseName()); items.add(item); appTypeTousseItemMap.put(appType, items);