Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r25673 -r25694
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 25673)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 25694)
@@ -5004,7 +5004,7 @@
 			}
 
 			//如果申请单类型为手术预约申请单或外来器械申请单时,则将器械包信息的手术间设值为申请单的手术间 (XJJQZYY-24 手术预约和器械包信息增加手术相关信息)
-			if(invoicePlan.isOperationReservationApplication() || invoicePlan.isForeignTousseAppliaction()){
+			if(invoicePlan != null && (invoicePlan.isOperationReservationApplication() || invoicePlan.isForeignTousseAppliaction())){
 				tousseInstance.setOperationRoomName(invoicePlan.getOperationRoom());
 			}