Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r27619 -r27620 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 27619) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 27620) @@ -595,7 +595,7 @@ List invoicePlanIds = new ArrayList(); List tousseItemIds = new ArrayList(); // 器械包名称和包实例的Map - Map> tousseNameToTousseInstancesMap = new HashMap>(); + Map> tousseNameAndTypeToTousseInstancesMap = new HashMap>(); // 获取tousseNameToTousseInstancesMap for (ApplicationGoodsVo applicationGoodsVo : list) { Map> map = applicationGoodsVo.getInvoicePlanIdToTousseItemIdListMap(); @@ -620,12 +620,13 @@ tousseInstances = objectDao.findByHql(tousseInstanceHql); if(CollectionUtils.isNotEmpty(tousseInstances)){ for (TousseInstance tousseInstance : tousseInstances) { - List tempList = tousseNameToTousseInstancesMap.get(tousseInstance.getTousseName()); + String key = String.format("%s_%s", tousseInstance.getTousseName(), tousseInstance.getTousseDefinition().getTousseType()); + List tempList = tousseNameAndTypeToTousseInstancesMap.get(key); if(CollectionUtils.isEmpty(tempList)){ tempList = new ArrayList(); } tempList.add(tousseInstance); - tousseNameToTousseInstancesMap.put(tousseInstance.getTousseName(), tempList); + tousseNameAndTypeToTousseInstancesMap.put(key, tempList); } } } @@ -649,7 +650,8 @@ } // 器械包灭菌状态判断 - List tempList = tousseNameToTousseInstancesMap.get(applicationGoodsVo.getName()); + String key = String.format("%s_%s", applicationGoodsVo.getName(), applicationGoodsVo.getGoodsType()); + List tempList = tousseNameAndTypeToTousseInstancesMap.get(key); if(CollectionUtils.isNotEmpty(tempList)){ for (TousseInstance tousseInstance : tempList) { if(StringUtils.equals(tousseInstance.getStatus(), TousseInstance.STATUS_STERILED)){ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r27590 -r27620 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 27590) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 27620) @@ -4525,6 +4525,7 @@ tousseItem.setHideRecycling(newItem.getHideRecycling()); tousseItem.setIsInvoice(newItem.getIsInvoice()); tousseItem.setDisposableGoodsId(newItem.getDisposableGoodsId()); + tousseItem.setDisposableGoodsType(newItem.getDisposableGoodsType()); tousseItem.setIsApplyEntireTousse(newItem.getIsApplyEntireTousse()); tousseItem.setIsCleanedEntirely(newItem.getIsCleanedEntirely()); tousseItem.setIsThereIdentificationCard(newItem.getIsThereIdentificationCard());