Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r38044 -r38070
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 38044)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 38070)
@@ -6640,8 +6640,8 @@
 				Map<String,Object> invoiceAndInvoiceItemMap = getInvoiceAndInvoiceItemForTousseItem(invoiceToInvoiceItemListMap,
 						tousseItem);
 				Invoice invoice = (Invoice)invoiceAndInvoiceItemMap.get("invoice");
-				InvoiceItem invoiceItem = (InvoiceItem)invoiceAndInvoiceItemMap.get("invoiceItem");
-				if(invoice != null && invoiceItem != null){
+				List<InvoiceItem> invoiceItemList = (List<InvoiceItem>)invoiceAndInvoiceItemMap.get("invoiceItemList");
+				if(invoice != null && CollectionUtils.isNotEmpty(invoiceItemList)){
 					for(Entry<Long,List<ExpensiveDisposablegoods>> batchIdToEdgListEntry : 
 						batchIdToEdgListMap.entrySet()){
 						List<ExpensiveDisposablegoods> edgList = batchIdToEdgListEntry.getValue();
@@ -6654,7 +6654,7 @@
 								map.put("location", orgUnit.getOrgUnitCoding());
 								map.put("locationForDisplay", orgUnit.getName());
 								map.put("invoiceId", invoice.getId());
-								map.put("invoiceItemID", invoiceItem.getId());
+								map.put("invoiceItemID", invoiceItemList.get(0).getId());
 								map.put("id", expensiveDisposablegoods.getId());
 								mapList.add(map);
 							}
@@ -6715,8 +6715,8 @@
 				Map<String,Object> invoiceAndInvoiceItemMap = getInvoiceAndInvoiceItemForTousseItem(invoiceToInvoiceItemListMap,
 						tousseItem);
 				Invoice invoice = (Invoice)invoiceAndInvoiceItemMap.get("invoice");
-				InvoiceItem invoiceItem = (InvoiceItem)invoiceAndInvoiceItemMap.get("invoiceItem");
-				if(invoice != null && invoiceItem != null){
+				List<InvoiceItem> invoiceItemList = (List<InvoiceItem>)invoiceAndInvoiceItemMap.get("invoiceItemList");
+				if(invoice != null && CollectionUtils.isNotEmpty(invoiceItemList)){
 					for(Entry<DisposableGoodsIdentification,Integer> identiToAmountEntry : 
 						identiToAmountMap.entrySet()){
 						DisposableGoodsIdentification identi = identiToAmountEntry.getKey();
@@ -6781,8 +6781,8 @@
 				Map<String,Object> invoiceAndInvoiceItemMap = getInvoiceAndInvoiceItemForTousseItem(invoiceToInvoiceItemListMap,
 						tousseItem);
 				Invoice invoice = (Invoice)invoiceAndInvoiceItemMap.get("invoice");
-				InvoiceItem invoiceItem = (InvoiceItem)invoiceAndInvoiceItemMap.get("invoiceItem");
-				if(invoice != null && invoiceItem != null){
+				List<InvoiceItem> invoiceItemList = (List<InvoiceItem>)invoiceAndInvoiceItemMap.get("invoiceItemList");
+				if(invoice != null && CollectionUtils.isNotEmpty(invoiceItemList)){
 					for(Entry<DisposableGoodsIdentification,Integer> identiToAmountEntry : 
 						identiToAmountMap.entrySet()){
 						DisposableGoodsIdentification identi = identiToAmountEntry.getKey();
@@ -6878,8 +6878,8 @@
 				Map<String,Object> invoiceAndInvoiceItemMap = getInvoiceAndInvoiceItemForTousseItem(invoiceToInvoiceItemListMap,
 						tousseItem);
 				Invoice invoice = (Invoice)invoiceAndInvoiceItemMap.get("invoice");
-				InvoiceItem invoiceItem = (InvoiceItem)invoiceAndInvoiceItemMap.get("invoiceItem");
-				if(invoice != null && invoiceItem != null){
+				List<InvoiceItem> invoiceItemList = (List<InvoiceItem>)invoiceAndInvoiceItemMap.get("invoiceItemList");
+				if(invoice != null && CollectionUtils.isNotEmpty(invoiceItemList)){
 					for(Entry<DisposableGoodsIdentification,Integer> identiToAmountEntry : 
 						identiToAmountMap.entrySet()){
 						DisposableGoodsIdentification identi = identiToAmountEntry.getKey();
@@ -7639,8 +7639,8 @@
 				Map<String,Object> invoiceAndInvoiceItemMap = getInvoiceAndInvoiceItemForTousseItem(invoiceToInvoiceItemListMap,
 						tousseItem);
 				Invoice invoice = (Invoice)invoiceAndInvoiceItemMap.get("invoice");
-				InvoiceItem invoiceItem = (InvoiceItem)invoiceAndInvoiceItemMap.get("invoiceItem");
-				if(invoice != null && invoiceItem != null){
+				List<InvoiceItem> invoiceItemList = (List<InvoiceItem>)invoiceAndInvoiceItemMap.get("invoiceItemList");
+				if(invoice != null && CollectionUtils.isNotEmpty(invoiceItemList)){
 					for(Entry<Long,List<ExpensiveDisposablegoods>> batchIdToEdgListEntry : 
 						batchIdToEdgListMap.entrySet()){
 						List<ExpensiveDisposablegoods> edgList = batchIdToEdgListEntry.getValue();
@@ -7653,7 +7653,7 @@
 								map.put("location", orgUnit.getOrgUnitCoding());
 								map.put("locationForDisplay", orgUnit.getName());
 								map.put("invoiceId", invoice.getId());
-								map.put("invoiceItemID", invoiceItem.getId());
+								map.put("invoiceItemID", invoiceItemList.get(0).getId());
 								map.put("disposableGoodsStockID", targetDgIdToDisposableGoodsStockMap.get(expensiveDisposablegoods.getDisposableGoodsID()).getId());
 								map.put("batchStock_id", targetBatchIdToDisposableGoodsBatchStockMap.get(expensiveDisposablegoods.getDisposableGoodsBatchID()).getId());
 								map.put("id", expensiveDisposablegoods.getId());