Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r36777 -r36779 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36777) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36779) @@ -3479,7 +3479,7 @@ } Map expirationDateInfoMap = getExpirationDateInfoMap(packageTypes); Map disinfectItemArrayMap = tousseDefinitionManager.getMaterialsOfDisinfectionGoods(tdIdsOfDisinfection); - Map toolAndImplantAmountMap = tousseDefinitionManager.getToolAndImplantAmount(tdIdsOfForeignTousse); + Map toolAndImplantAmountMap = tousseDefinitionManager.getToolAndImplantAmountMap(tdIdsOfForeignTousse); Map idCardInstanceInfoMap = getIdCardInstanceInfoMap(idCardInstanceIDs); Map increaseStockByTousseNameMap = new HashMap(); for (TousseInstance tousseInstance : tousses) { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r36777 -r36779 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 36777) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 36779) @@ -2541,7 +2541,7 @@ return obj; } @Override - public Map getToolAndImplantAmount(Set tdIds) { + public Map getToolAndImplantAmountMap(Set tdIds) { Map toolAndImplantAmountMap = new HashMap(); if(CollectionUtils.isEmpty(tdIds)){ return toolAndImplantAmountMap; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r36777 -r36779 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 36777) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 36779) @@ -292,7 +292,7 @@ * @param tdIds 外来器械包或外来器械拆分小包定义id * @return */ - public Map getToolAndImplantAmount(Set tdIds); + public Map getToolAndImplantAmountMap(Set tdIds); public List getTousseDefinitionByFatherTousseId(Long id); /** * 根据器械包名称和器械包类型获取器械包定义.