Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r20001 -r20035 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20001) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20035) @@ -2437,15 +2437,24 @@ } } } - + /** + * 删除数据库已有的器械包里面的材料和一次性物品 + * @param tousseDefinition + */ private void deleteMaterialInstanceByTousseDefinition( TousseDefinition tousseDefinition) { List list = tousseDefinition.getMaterialInstances(); + List disposableList = tousseDefinition.getDiposableGoodsItems(); if (list != null) { for (Iterator it = list.iterator(); it.hasNext();) { objectDao.delete(it.next()); } } + if(disposableList != null) { + for (Iterator it = disposableList.iterator(); it.hasNext();) { + objectDao.delete(it.next()); + } + } } private int validateAndAddMaterialInstance(