Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14844 -r14845 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14844) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14845) @@ -350,25 +350,23 @@ //省医需求:如果是借物单,则将申请物品明细转换至物品简要属性 if(InvoicePlan.TYPE_BORROWINGSINGLE.equals(application.getType())){ application.tousseItemList2LendGoodsBrief(); - if(StringUtils.isBlank(application.getLendGoodsBrief())){ - if(CollectionUtils.isNotEmpty(newTousseItemVoList)){ - List lendGoodsBriefList = new ArrayList(); - String[] lendGoodsBriefArray = null; - Map map = new HashMap(); - for(TousseItemVo ti : newTousseItemVoList){ - if(map.get(ti.getTousseName()) == null){ - map.put(ti.getTousseName() , ti.getAmount()); - }else{ - map.put(ti.getTousseName() , map.get(ti.getTousseName()) + ti.getAmount()); - } + if(CollectionUtils.isNotEmpty(newTousseItemVoList)){ + List lendGoodsBriefList = new ArrayList(); + String[] lendGoodsBriefArray = null; + Map map = new HashMap(); + for(TousseItemVo ti : newTousseItemVoList){ + if(map.get(ti.getTousseName()) == null){ + map.put(ti.getTousseName() , ti.getAmount()); + }else{ + map.put(ti.getTousseName() , map.get(ti.getTousseName()) + ti.getAmount()); } - for(String key : map.keySet()){ - lendGoodsBriefList.add(key + "x" + map.get(key)); - } - lendGoodsBriefArray = new String[lendGoodsBriefList.size()]; - lendGoodsBriefList.toArray(lendGoodsBriefArray); - application.setLendGoodsBrief(StringUtils.join(lendGoodsBriefArray, ",")); } + for(String key : map.keySet()){ + lendGoodsBriefList.add(key + "x" + map.get(key)); + } + lendGoodsBriefArray = new String[lendGoodsBriefList.size()]; + lendGoodsBriefList.toArray(lendGoodsBriefArray); + application.setLendGoodsBrief(StringUtils.join(lendGoodsBriefArray, ",")); } } String msg = recyclingApplicationManager.saveRecyclingApplication(application, newTousseItemVoList,