Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r14674 -r14684
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14674)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14684)
@@ -1220,11 +1220,17 @@
 			td = getInvoicePlanTousseDefinitionByTousseItem(tousseItem);
 			break;
 		default:
-			td = getTousseDefinitionByName(tousseItem.getTousseName());
+			//普通器械包和自定义器械包有同名的情况
+			if(tousseItem.getTousseDefinitionId() != null){
+				td = getTousseDefinitionById(tousseItem.getTousseDefinitionId());
+			}else{
+				td = getTousseDefinitionByName(tousseItem.getTousseName());
+			}
 			break;
 		}
 		return td;
 	}
+	
 	@Override
 	@SuppressWarnings("unchecked")
 	public TousseDefinition getByNameAndSupplierName(String tousseName,