Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r36573 -r36574 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36573) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36574) @@ -3431,6 +3431,8 @@ virtualBasketNameList.add(reviewedBasket.getContainer().getContainerName()); } Set oldReviewBasketIds = new HashSet();//包实例中VirtualBasketSeqNum为空的篮筐id 数据中是有这种虚拟筐的 + Map toolAndImplantAmountMap = new HashMap(); + Map disinfectItemArrayMap = new HashMap(); for (TousseInstance tousseInstance : tousses) { if(DatabaseUtil.isPoIdValid(tousseInstance.getPackingRecord_id())){ idsForUpdateReviewer.add(tousseInstance.getPackingRecord_id()); @@ -3467,9 +3469,13 @@ // 审核的是消毒物品 if (td.isDisinfection()) { isDisinfectionGoods = true; + if(disinfectItemArrayMap.containsKey(td.getId())){ + disinfectItemArray = disinfectItemArrayMap.get(td.getId()); + }else{ + disinfectItemArray = tousseDefinitionManager.getMaterialsOfDisinfectionGoods(td); + disinfectItemArrayMap.put(td.getId(), disinfectItemArray); + } - disinfectItemArray = tousseDefinitionManager.getMaterialsOfDisinfectionGoods(td); - // 更新包状态 tousseInstance .setStatus(TousseInstance.STATUS_DISINFECTED); @@ -3591,9 +3597,14 @@ } } - JSONObject toolAndImplantAmount = tousseDefinitionManager.getToolAndImplantAmount(td); + JSONObject toolAndImplantAmount = null; + if(toolAndImplantAmountMap.containsKey(td.getId())){ + toolAndImplantAmount = toolAndImplantAmountMap.get(td.getId()); + }else{ + toolAndImplantAmount = tousseDefinitionManager.getToolAndImplantAmount(td); + toolAndImplantAmountMap.put(td.getId(), toolAndImplantAmount); + } - String validUntilDateToPrint = ""; String sterileDateToPrint = ""; boolean markTousse = false;