Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java =================================================================== diff -u -r39483 -r39501 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java (.../LaoKenThirdPartyTousseReceiveRecordManagerImpl.java) (revision 39483) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java (.../LaoKenThirdPartyTousseReceiveRecordManagerImpl.java) (revision 39501) @@ -622,8 +622,8 @@ } //根据器械包定义id及编号,查询已经保存的标识牌:器械包定义id-标识牌编号-标识牌实例的map Map> tousseDefinitionIdIdNumberIDCardInstanceMap = getTousseDefinitionIdIdNumberIDCardInstanceMap(thirdPartyTousseInstances, tousseDefinitionMap); - //创建标识牌实例 - Map> addIDCardDefinitionIdNumberMap = new HashMap>(); + //器械包名称及标识牌编号map + Map> tousseNameAddIDCardDefinitionIdNumberMap = new HashMap>(); for (ThirdPartyTousseInstanceVo thirdPartyTousseInstanceVo : thirdPartyTousseInstances) { String tousseName = thirdPartyTousseInstanceVo.getTousseName(); TousseDefinition tousseDefinition = tousseDefinitionMap.get(tousseName); @@ -637,12 +637,12 @@ Map idNumberIDCardInstanceMap = tousseDefinitionIdIdNumberIDCardInstanceMap.get(tousseDefinition.getId()); if(MapUtils.isEmpty(idNumberIDCardInstanceMap)){ //需要创建新标识牌的标识牌编号 - List idNumberList = addIDCardDefinitionIdNumberMap.get(tousseDefinition.getId()); + List idNumberList = tousseNameAddIDCardDefinitionIdNumberMap.get(tousseDefinition.getName()); if(idNumberList == null){ idNumberList = new ArrayList(); } idNumberList.add(instanceID); - addIDCardDefinitionIdNumberMap.put(tousseDefinition.getName(), idNumberList); + tousseNameAddIDCardDefinitionIdNumberMap.put(tousseDefinition.getName(), idNumberList); continue; } boolean exitIDCardInstance = false; @@ -656,16 +656,16 @@ continue; } //需要创建新标识牌的标识牌编号 - List idNumberList = addIDCardDefinitionIdNumberMap.get(tousseDefinition.getId()); + List idNumberList = tousseNameAddIDCardDefinitionIdNumberMap.get(tousseDefinition.getName()); if(idNumberList == null){ idNumberList = new ArrayList(); } idNumberList.add(instanceID); - addIDCardDefinitionIdNumberMap.put(tousseDefinition.getName(), idNumberList); + tousseNameAddIDCardDefinitionIdNumberMap.put(tousseDefinition.getName(), idNumberList); } //添加标识牌 - addIDCardDefinition(tousseDefinitionIdIdNumberIDCardInstanceMap, addIDCardDefinitionIdNumberMap, tousseDefinitionMap); + addIDCardDefinition(tousseDefinitionIdIdNumberIDCardInstanceMap, tousseNameAddIDCardDefinitionIdNumberMap, tousseDefinitionMap); return tousseDefinitionIdIdNumberIDCardInstanceMap; }