Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r27247 -r27249
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27247)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27249)
@@ -2075,6 +2075,7 @@
                             		'settleAccountsDepart' : 'name',
                                     'settleAccountsDepartCoding' : 'id'
 								}
+								top.Ext4.getCmp('operationRoom').setValue("");
 								orgUnitCodeOperationRoom = record[0].get('id');
 								operationRoomJsonStore.proxy.extraParams.orgUnitCode = orgUnitCodeOperationRoom;
 								operationRoomJsonStore.load();
@@ -2105,6 +2106,7 @@
 							change : function(){
 								var departVal = top.Ext4.getCmp("depart").getValue();
 								if(departVal == "" || departVal == null || departVal == undefined){
+									top.Ext4.getCmp('operationRoom').setValue("");
 									orgUnitCodeOperationRoom = "";
 									operationRoomJsonStore.proxy.extraParams.orgUnitCode = orgUnitCodeOperationRoom;
 									operationRoomJsonStore.load();
@@ -2718,7 +2720,6 @@
 		// 1、查找默认的“申请科室”和“结算科室”，首先取科室供应室配置的，再取config里面的配置，都没有取到才设置为当前登录科室的
 		var depart = $Id('depart').value;
 		var departCoding = $Id('departCoding').value;
-		orgUnitCodeOperationRoom = departCoding;
 		var appDepart = depart;
 		var appDepartCode = departCoding;
 		var settleAccountsDepart = depart;
@@ -2791,7 +2792,7 @@
 				}
 			}
 		});
-		
+		orgUnitCodeOperationRoom = appDepartCode;
 		//simon-add:根据申请科室编码查找此申请科室设置的默认结算科室；如果没有配置默认的结算科室，那么结算科室默认显示为可结算的申请科室
 		top.Ext4.getCmp("settleAccountsDepart").setValue(settleAccountsDepart);
 		top.Ext4.getCmp("settleAccountsDepartCoding").setValue(settleAccountsDepartCode);
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r27230 -r27249
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 27230)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 27249)
@@ -218,7 +218,7 @@
 		),
 		listeners: {
 			beforeload: function(s,options){	
-				s.baseParams.orgUnitCode = top.Ext.getCmp('departCoding').getValue();
+				//s.baseParams.orgUnitCode = top.Ext.getCmp('departCoding').getValue();
 			}
 		}
 	});
@@ -354,14 +354,24 @@
 					allowBlank : false,
 					anchor : '100%',
 					listeners : {
-						select : function(combo , record , index){
+						select : function(combo , record , index){  
 							top.Ext.getCmp('departCoding').setValue(record.data.id);
 							top.Ext.getCmp('depart').setValue(record.data.name);
 							operationNameStore.load();
 							handleDepartStore.load();
+							top.Ext.getCmp('operatingRoom').setValue("");
 							operationRoomJsonStore.baseParams.orgUnitCode = record.data.id;
 							operationRoomJsonStore.load();
 							
+						},
+						blur : function(){
+							var departVal = top.Ext.getCmp("depart").getRawValue();
+							if(departVal == "" || departVal == null || departVal == undefined){
+								top.Ext.getCmp('departCoding').setValue("");
+								top.Ext.getCmp('operatingRoom').setValue("");
+								operationRoomJsonStore.baseParams.orgUnitCode = "";
+								operationRoomJsonStore.load();
+							}							
 						}
 					}
 				}]