Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r33926 -r33930
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33926)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33930)
@@ -50,7 +50,6 @@
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
-import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.barcode.util.BarcodeUtils;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
@@ -91,7 +90,6 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.ExpensiveGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
-import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceGoodsVo;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice_InvoicePlan;
@@ -815,7 +813,9 @@
 									&& vo.getSterilizerName().equals(
 											sterilizerName)
 									//ZJYY-95如果需要打印出【备注】信息，并且物品有备注，就不合并
-									&& ((isMergeRemark && StringUtils.equals(tousseInstance.getRemark(), vo.getRemark())) || !isMergeRemark)) {
+									&& ((isMergeRemark 
+											&& StringUtils.equals(StringUtils.defaultString(tousseInstance.getRemark()), StringUtils.defaultString(vo.getRemark()))) 
+											|| !isMergeRemark)) {
 								tempVo = vo;
 								break;
 							}
@@ -834,6 +834,7 @@
 							tempVo.setSterilizationdate(sterilizationdate);
 							tempVo.setSterilizerName(sterilizerName);
 							tempVo.setTotalPrice(tousseInstance.getPrice());
+							tempVo.setRemark(StringUtils.defaultString(tousseInstance.getRemark()));
 							voList.add(tempVo);
 						}
 						if(invoice.getInvoicePlan() != null && StringUtils.isBlank(tempVo.getApplicationDate())){
@@ -849,6 +850,7 @@
 						tempVo.setSterilizationdate(sterilizationdate);
 						tempVo.setSterilizerName(sterilizerName);
 						tempVo.setTotalPrice(tousseInstance.getPrice());
+						tempVo.setRemark(StringUtils.defaultString(tousseInstance.getRemark()));
 						voList.add(tempVo);
 						map.put(tousseInstance.getTousseName(), voList);
 						if(invoice.getInvoicePlan() != null && StringUtils.isBlank(tempVo.getApplicationDate())){
@@ -982,9 +984,9 @@
 					List<InvoicePrintVo> voList = map.get(goodsItem.getName());
 					Double totalPrice = MathTools.mul(goodsItem.getPrice(), goodsItem.getAmount()).doubleValue();
 					// 合并名称相同的物品，灭菌日期、灭菌炉、炉次都要相同
+					String key = goodsItem.getDisposableGoodsID() + "_" + invoice.getId() + "_" + invoice.getInvoicePlan().getId();
 					if (voList != null) {
 						InvoicePrintVo tempVo = null;
-						String key = goodsItem.getDisposableGoodsID() + "_" + invoice.getId() + "_" + invoice.getInvoicePlan().getId();
 						for (InvoicePrintVo vo : voList) {
 							if (vo.getBatchNumber().equals(batchNumber)
 									&& vo.getDiposableGoodsPrice()
@@ -995,7 +997,9 @@
 											specification)
 									//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 									//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-									&& ((isMergeRemark && StringUtils.equals(applyRemarkMap.get(key), vo.getRemark())) || isMergeRemark)) {
+									&& ((isMergeRemark 
+											&& StringUtils.equals(StringUtils.defaultString(applyRemarkMap.get(key)), StringUtils.defaultString(vo.getRemark()))) 
+											|| !isMergeRemark)) {
 								tempVo = vo;
 								break;
 							}
@@ -1017,7 +1021,7 @@
 							tempVo.setBatchNumber(goodsItem.getBatch());
 							tempVo.setExternalCode("");
 							tempVo.setSpecification(specification);
-							tempVo.setRemark(applyRemarkMap.get(key));
+							tempVo.setRemark(StringUtils.defaultString(applyRemarkMap.get(key)));
 							voList.add(tempVo);
 						}
 					} else {
@@ -1030,6 +1034,7 @@
 						tempVo.setBatchNumber(goodsItem.getBatch());
 						tempVo.setExternalCode("");
 						tempVo.setSpecification(specification);
+						tempVo.setRemark(StringUtils.defaultString(applyRemarkMap.get(key)));
 						voList.add(tempVo);
 						map.put(goodsItem.getName(), voList);
 
@@ -9143,7 +9148,9 @@
 								sterilizerName)
 						//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 						//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-						&& ((isMergeRemark && StringUtils.equals(tousseInstance.getRemark(), vo.getRemark())) || !isMergeRemark)) {
+						&& ((isMergeRemark 
+								&& StringUtils.equals(StringUtils.defaultString(tousseInstance.getRemark()), StringUtils.defaultString(vo.getRemark()))) 
+								|| !isMergeRemark)) {
 					invoicePrintVo = vo;
 					break;
 				}
@@ -9154,7 +9161,9 @@
 				if (StringUtils.equals(vo.getName(), tousseName)
 						//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 						//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-						&& ((isMergeRemark && StringUtils.equals(tousseInstance.getRemark(), vo.getRemark())) || !isMergeRemark)) {
+						&& ((isMergeRemark 
+								&& StringUtils.equals(StringUtils.defaultString(tousseInstance.getRemark()), StringUtils.defaultString(vo.getRemark())))
+								|| !isMergeRemark)) {
 					invoicePrintVo = vo;
 					break;
 				}
@@ -9304,7 +9313,7 @@
 					}
 					tempVo.setInvoiceIds(invoiceIds);
 					//ZJYY-95
-					tempVo.setRemark(tousseInstance != null ? tousseInstance.getRemark() : tousseItem.getRemarkOfApplyGoods());
+					tempVo.setRemark(tousseInstance != null ? StringUtils.defaultString(tousseInstance.getRemark()) : StringUtils.defaultString(tousseItem.getRemarkOfApplyGoods()));
 					voList.add(tempVo);
 				}
 			}
@@ -9615,7 +9624,7 @@
 							tempVo.setTotalPrice(tousseInstance.getPrice());
 							tempVo.setSupplierName(tousseDefinition.getSupplierName());
 							//ZJYY-95打印发货单时，如果需要物品申领备注，只要配置打印包实例的备注字段即可
-							tempVo.setRemark(tousseInstance.getRemark());
+							tempVo.setRemark(StringUtils.defaultString(tousseInstance.getRemark()));
 							voList.add(tempVo);
 						}
 						Set<Long> invoiceIds = tempVo.getInvoiceIds();
@@ -10005,7 +10014,7 @@
 					invoicePrintVo.setMaterialAmount(MathTools.mul(thisSendoutAmount, materialJson.getInt("totalAmout")).intValue());
 					invoicePrintVo.setTotalPrice(MathTools.mul(thisSendoutAmount, materialJson.getDouble("totalPrice")).doubleValue());
 					//物品申领备注ZJYY-95
-					invoicePrintVo.setRemark(tousseInstance != null ? tousseInstance.getRemark() : tousseItem.getRemarkOfApplyGoods());
+					invoicePrintVo.setRemark(tousseInstance != null ? StringUtils.defaultString(tousseInstance.getRemark()) : StringUtils.defaultString(tousseItem.getRemarkOfApplyGoods()));
 				}
 			}
 		}
@@ -10068,7 +10077,7 @@
 					//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 					//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
 					if(StringUtils.isNotBlank(tousseInstance.getRemark())){
-						keyName += "_" + tousseInstance.getRemark();
+						keyName += "_" + StringUtils.defaultString(tousseInstance.getRemark());
 					}
 				}
 				
@@ -10118,7 +10127,7 @@
 				invoiceIds.add(invoice.getId());
 				invoicePrintVo.setInvoiceIds(invoiceIds);
 				//ZJYY-95
-				invoicePrintVo.setRemark(tousseInstance.getRemark());
+				invoicePrintVo.setRemark(StringUtils.defaultString(tousseInstance.getRemark()));
 //				List<MaterialInstance> materialList = tousseDefinition.getMaterialInstances();
 //				for (MaterialInstance materialInstance : materialList) {
 //					String materialName = materialInstance.getMaterialName();
@@ -10499,7 +10508,9 @@
 							&& vo.nameWithSpecification().equals(goodsName)
 							//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 							//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-							&& ((isMergeRemark && StringUtils.equals(applyRemarkMap.get(key), vo.getRemark()) || !isMergeRemark))) {
+							&& ((isMergeRemark 
+									&& StringUtils.equals(StringUtils.defaultString(applyRemarkMap.get(key)), StringUtils.defaultString(vo.getRemark()))
+									|| !isMergeRemark))) {
 						tempVo = vo;
 						break;
 					}
@@ -10553,7 +10564,7 @@
 							}
 						}
 						//一次性物品的申领备注ZJYY-95
-						tempVo.setRemark(applyRemarkMap.get(key));
+						tempVo.setRemark(StringUtils.defaultString(applyRemarkMap.get(key)));
 					}
 					voList.add(tempVo);
 				}
@@ -10677,7 +10688,9 @@
 							&& (modelName != null ? modelName.equals(vo.getExpensiveGoodsModelName()): true)
 							//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 							//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-							&& ((isMergeRemark && StringUtils.equals(vo.getRemark(), expensiveGoodsApplyRemarkMap.get(key))) || !isMergeRemark)) {
+							&& ((isMergeRemark 
+									&& StringUtils.equals(StringUtils.defaultString(vo.getRemark()), StringUtils.defaultString(expensiveGoodsApplyRemarkMap.get(key)))) 
+									|| !isMergeRemark)) {
 						tempVo = vo;
 						break;
 					}
@@ -10697,7 +10710,7 @@
 					tempVo.setExpensiveGoodsUnit(unit);
 					tempVo.setExpensiveGoodsType(InvoicePrintVo.EXPENSIVEGOODS_TYPE);
 					tempVo.setSendDate(invoice.getSendTime());
-					tempVo.setRemark(expensiveGoodsApplyRemarkMap.get(key));
+					tempVo.setRemark(StringUtils.defaultString(expensiveGoodsApplyRemarkMap.get(key)));
 					voList.add(tempVo);
 				}
 				if(invoice.getInvoicePlan() != null && StringUtils.isBlank(tempVo.getApplicationDate())){