Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r14354 -r14379
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14354)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14379)
@@ -1345,7 +1345,9 @@
 	    	  result.serialNumber2 = serialNumber;
 	    	  result.remark2 = remark;
 	    	  result.applicationTime = applicationTime;
-	    	  result.hospitalNumber = hospitalNumber;
+	    	  if(isUndefinedOrNullOrEmpty(result.hospitalNumber) && !isUndefinedOrNullOrEmpty(hospitalNumber)){
+	    		  result.hospitalNumber = hospitalNumber;
+	    	  }
 	    	  var dt = new Date();
 	    	  var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate();
 	    	  result.printDate = printDate;
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r14369 -r14379
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14369)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14379)
@@ -83,6 +83,7 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.DateJsonValueProcessor;
 import com.forgon.tools.json.JsonPropertyFilter;
+import com.forgon.tools.string.StringTools;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
@@ -1112,6 +1113,8 @@
 	// 合并打印
 	public void mergeLoadToussePrintData() {
 		try {
+			Map<String, Object> map = new HashMap<String, Object>();
+			
 			Collection<InvoicePrintVo> tousseList;
 			Collection<InvoicePrintVo> disinfectGoodslist;
 			Collection<InvoicePrintVo> diposableGoodsList;
@@ -1127,14 +1130,19 @@
 			} else {
 				String idsStr = StrutsParamUtils.getPraramValue("ids", "");
 				String[] idStrs = StringUtils.split(idsStr, ',');
+				if(idStrs.length == 1){
+					//如果是单张单，获取住院号
+					Invoice invoice = invoiceManager.getInvoiceById(idStrs[0]);
+					map.put("hospitalNumber", StringTools.defaultString(invoice.getHospitalNumber()));
+				}
 				tousseList = invoiceManager.loadToussePrintData(idStrs);
 				disinfectGoodslist = invoiceManager
 						.getDisinfectGoodsPrintData(idStrs);
 				diposableGoodsList = invoiceManager
 						.getDiposableGoodsPrintData(idStrs);
 			}
 
-			Map<String, Object> map = new HashMap<String, Object>();
+			
 			map.put("success", true);
 			map.put("tousse", tousseList);
 			map.put("disinfectGoods", disinfectGoodslist);