Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r36582 -r36666
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 36582)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 36666)
@@ -80,6 +80,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
+import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
 import com.forgon.disinfectsystem.entity.packing.PackingRecord;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
@@ -1812,6 +1813,13 @@
 //					map.put("assistantSender", StringTools.defaultString(invoice.getAssistantSender()));
 					map.put("receiptor", StringTools.defaultString(invoice.getReceiptor()));
 					map.put("receiptingTime", StringTools.defaultString(invoice.getReceiptingTime_YYYYMMDDHHMM()));
+					InvoicePlan ip = invoice.getInvoicePlan();
+					if(ip != null && ip instanceof OperationReservation){
+						//BJDXZLYY-39打印的手术预约发货的发货单上增加手术间、手术台次
+						OperationReservation operationReservation = (OperationReservation) ip;
+						map.put("consoleName", StringTools.defaultString(operationReservation.getConsoleName()));
+						map.put("operatingRoom", StringTools.defaultString(operationReservation.getOperatingRoom()));
+					}
 				}
 				if(idStrs.length > 0){
 					Invoice invoice = invoiceManager.get(idStrs[0]);