Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java
===================================================================
diff -u -r38009 -r38010
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java	(.../InvoiceItemManagerImpl.java)	(revision 38009)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java	(.../InvoiceItemManagerImpl.java)	(revision 38010)
@@ -4,8 +4,10 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -70,8 +72,6 @@
 				//InvoiceItem关联的DisposableGoodsBatch
 				Map<Long, List<DisposableGoodsBatch>> invoiceItemBatcheMap = getInvoiceItemDisposableGoodsBatchMap(idList);
 				Map<Long, DisposableGoods> invoiceItemDisposableGoodsMap = getInvoiceItemDisposableGoods(invoiceItems);
-				//同一个发货单明细包含多个批次时，按照一次性物品定义汇总显示
-				boolean mergeByDisposableGoods = false;
 				for(InvoiceItem ii : invoiceItems){
 					InvoiceItemSummaryVo find = null;
 					Long goodsId = null;
@@ -95,13 +95,12 @@
 								}
 							}
 						}
-						if(batch != null && !mergeByDisposableGoods){
+						if(batch != null){
 							//按照批次合并
 							find = InvoiceItemSummaryVo.find(vos, batch);
 						}else{
 							//按照一次性物品定义合并
 							find = InvoiceItemSummaryVo.find(vos, diposableGoods);
-							mergeByDisposableGoods = true;
 							if(find != null){
 								//不显示批次号
 								find.setBatchNumber(null);
@@ -158,6 +157,8 @@
 			}
 		}
 		int index = 1;
+		
+		vos = mergeInvoiceItemSummaryVo(vos);
 		for(InvoiceItemSummaryVo vo : vos){
 			vo.setIndex(index++);
 			// 设置申领单位数量
@@ -172,6 +173,47 @@
 	}
 
 	/**
+	 * 合并显示
+	 * @param vos
+	 * @return
+	 */
+	private List<InvoiceItemSummaryVo> mergeInvoiceItemSummaryVo(List<InvoiceItemSummaryVo> vos) {
+		List<InvoiceItemSummaryVo> mergeVos = new ArrayList<InvoiceItemSummaryVo>();
+		boolean merge = false;
+		Map<Long, List<InvoiceItemSummaryVo>> voMap = new LinkedHashMap<Long, List<InvoiceItemSummaryVo>>();
+		for (InvoiceItemSummaryVo vo : vos) {
+			if(DatabaseUtil.isPoIdValid(vo.getDisposableGoodsId())){
+				List<InvoiceItemSummaryVo> list = voMap.get(vo.getDisposableGoodsId());
+				if(list == null){
+					list = new ArrayList<InvoiceItemSummaryVo>();
+				}
+				list.add(vo);
+				voMap.put(vo.getDisposableGoodsId(), list);
+				if(!DatabaseUtil.isPoIdValid(vo.getGoodsId())){
+					merge = true;
+				}
+			}
+		}
+		if(!merge){
+			return vos;
+		}
+		
+		for (Entry<Long, List<InvoiceItemSummaryVo>> entry : voMap.entrySet()) {
+			List<InvoiceItemSummaryVo> values = entry.getValue();
+			InvoiceItemSummaryVo vo = values.get(0);
+			for(int i=1;i<values.size();i++){
+				InvoiceItemSummaryVo mVo = values.get(i);
+				vo.setAmount(MathTools.add(vo.getAmount(), mVo.getAmount()).intValue());
+				if(DisposableGoodsUtils.isMiddlePackageUnitEnabled(vo.getTransferScale())){
+					vo.setMiddlePackageUnitAmount(MathTools.add(vo.getMiddlePackageUnitAmount(), mVo.getMiddlePackageUnitAmount()).intValue());
+				}
+			}
+			mergeVos.add(vo);
+		}
+		return mergeVos;
+	}
+
+	/**
 	 * 发货明细的一次性物品定义id及一次性物品定义的map
 	 * @param invoiceItems
 	 * @return