Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r14100 -r14141 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14100) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14141) @@ -3359,20 +3359,24 @@ .getToussInstanceByForeignTousseApplicationID(invoicePlan .getId()); if(tousseInstanceList.size() > 0){ + for (TousseInstance tousseInstance : tousseInstanceList) { String tousseName = tousseInstance.getTousseName(); - ApplicationGoodsVo vo = new ApplicationGoodsVo(); + ApplicationGoodsVo vo = datas.get(tousseName); + if(vo == null){ + vo = new ApplicationGoodsVo(); + datas.put(tousseName, vo); + } vo.setName(tousseName); String showName = tousseName; vo.setShowTousseName(showName); vo.setDiposable(applicationItem.getDiposable()); vo.setInvoicePlanType(invoicePlan.getType()); vo.setGoodsType(tousseType); - vo.setCount(1); - vo.setApplicationAmount(1); + vo.setCount(vo.getCount()+1); + vo.setApplicationAmount(vo.getApplicationAmount()+1); vo.setBeforeToday(vo.isBeforeToday() || beforeToday); vo.addInvoicePlanID(invoicePlan.getId()); - datas.put(tousseName, vo); } continue; }