Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r13005 -r13007
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 13005)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 13007)
@@ -134,6 +134,12 @@
 function setHiddenFieldsAllowBlank(allowBlank){
 	Ext.getCmp("timingSignInvoiceTime").allowBlank = allowBlank;
 }
+
+function hideMask(count,myMask){
+	if(count == 4){
+		myMask.hide();
+	}
+}
 Ext.onReady(function(){
 	
 	var departJsonStore = new Ext.data.Store({
@@ -168,7 +174,7 @@
 		baseParams :{type:"1"},
 		reader : rd
 	});
-	supplyRoom1Store.load();
+	
 	supplyRoom1Store2 = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
@@ -177,7 +183,7 @@
 		baseParams :{type:"2"},
 		reader : rd
 	});
-	supplyRoom1Store2.load();
+	
 	//申领科室
 	supplyRoom1Store3 = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -186,7 +192,7 @@
 		}),
 		reader : rd
 	});
-	supplyRoom1Store3.load();
+	
 	//结算科室
 	supplyRoom1Store4 = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -195,8 +201,8 @@
 		}),
 		reader : rd
 	});
-	supplyRoom1Store4.load();
 	
+	
 	var cm = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
@@ -1509,12 +1515,6 @@
     }]
   });
   
-  var myMask = new Ext.LoadMask(Ext.getBody(), {
-		msg: '正在加载，请稍候！',
-		removeMask: true
-	});
-	myMask.show();
-  
   	SupplyRoomConfigTableManager.getStartTimeObject(function(supplyRoomConfig){
   		if(supplyRoomConfig!=null){
   			if(supplyRoomConfig.dayStartTime!=null){
@@ -1649,8 +1649,41 @@
 			}
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
-			myMask.hide();
+			
   		}
-  		
   });
+  	
+  	var myMask = new Ext.LoadMask(Ext.getBody(), {
+		msg: '正在加载，请稍候！',
+		removeMask: true
+	});
+	myMask.show();
+	
+	var count = 0;
+	
+  	supplyRoom1Store.load({  
+  	    callback: function(records, options, success){  
+  	    	count++;
+  			hideMask(count,myMask);
+  	    }  
+  	});
+	supplyRoom1Store2.load({  
+  	    callback: function(records, options, success){  
+  	    	count++;
+  			hideMask(count,myMask);
+  	    }  
+  	});
+	supplyRoom1Store3.load({  
+  	    callback: function(records, options, success){  
+  	    	count++;
+  			hideMask(count,myMask);
+  	    }  
+  	});
+	supplyRoom1Store4.load({  
+  	    callback: function(records, options, success){  
+  	    	count++;
+  			hideMask(count,myMask);
+  	    }  
+  	});
+	
 });
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r12851 -r13007
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 12851)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 13007)
@@ -187,8 +187,7 @@
 					SupplyRoomConfig supplyRoomConfig = new SupplyRoomConfig();
 					supplyRoomConfig.setOrgUnitCoding(departId);
 					supplyRoomConfig.setOrgUnitName(name);
-					supplyRoomConfig
-							.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_1);
+					supplyRoomConfig.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_1);
 					supplyRoomConfigManager.saveOrUpdate(supplyRoomConfig);
 					list.add(supplyRoomConfig);
 				} else {
@@ -448,30 +447,33 @@
 	public List<SupplyRoomConfig> getDeleteSupplyRoomConfig(int type,
 			List<SupplyRoomConfig> newSupplyRoom) {
 		List<SupplyRoomConfig> delSupplyRoom = new ArrayList<SupplyRoomConfig>();
-		List<SupplyRoomConfig> list = null;
+		List<SupplyRoomConfig> oldConfigList = null;
 		if (SupplyRoomConfig.SUPPLYROOM_TYPE_2 == type) {
-			list = supplyRoomConfigManager.getSecondSupplyRoomList();
+			oldConfigList = supplyRoomConfigManager.getSecondSupplyRoomList();
 		} else if (SupplyRoomConfig.SUPPLYROOM_TYPE_3 == type) {
-			list = supplyRoomConfigManager.getRecyclingApplicationDepart();
+			oldConfigList = supplyRoomConfigManager.getRecyclingApplicationDepart();
 		}else if(SupplyRoomConfig.SUPPLYROOM_TYPE_4 == type){
-			list = supplyRoomConfigManager.getSupplyRoomType_4();
+			oldConfigList = supplyRoomConfigManager.getSupplyRoomType_4();
 		} else {
-			SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager
-					.getFirstSupplyRoomConfig();
-			list = new ArrayList<SupplyRoomConfig>();
-			list.add(supplyRoomConfig);
+			SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+			oldConfigList = new ArrayList<SupplyRoomConfig>();
+			oldConfigList.add(supplyRoomConfig);
 		}
-		for (SupplyRoomConfig dbSupplyRoomConfig : list) {
-			boolean isNew = false;
-			for (SupplyRoomConfig newSupplyRoomConfig : newSupplyRoom) {
-				if (dbSupplyRoomConfig.getId() == newSupplyRoomConfig.getId()) {
-					isNew = true;
-					break;
+		if(oldConfigList != null){
+			for (SupplyRoomConfig oldConfig : oldConfigList) {
+				boolean isDelete = true;
+				if(newSupplyRoom != null){
+					for (SupplyRoomConfig currentConfig : newSupplyRoom) {
+						if (oldConfig.getId().equals(currentConfig.getId())) {
+							isDelete = false;
+							break;
+						}
+					}
 				}
+				if (isDelete) {
+					delSupplyRoom.add(oldConfig);
+				}
 			}
-			if (!isNew) {
-				delSupplyRoom.add(dbSupplyRoomConfig);
-			}
 		}
 		return delSupplyRoom;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r12838 -r13007
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 12838)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 13007)
@@ -1,13 +1,9 @@
 package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import net.sf.json.JSONArray;
-
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
Index: ssts-web/.classpath
===================================================================
diff -u -r12335 -r13007
--- ssts-web/.classpath	(.../.classpath)	(revision 12335)
+++ ssts-web/.classpath	(.../.classpath)	(revision 13007)
@@ -4,16 +4,11 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>