Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r15159 -r15241
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 15159)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 15241)
@@ -136,4 +136,12 @@
 	public boolean isSavePathExist();
 	public boolean isSavePathExist(String saveMethod,String saveDir);
 	public void createSavePath();
+	
+	/**
+	 * 添加该供应室服务所有临床科室
+	 * @param orgUnitCoding 供应室科室编码
+	 * @param orgUnitName 供应室科室名称
+	 * @return boolean
+	 */
+	public boolean addServiceAllClinicOrgUnit(String orgUnitCoding,String orgUnitName);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r15159 -r15241
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 15159)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 15241)
@@ -15,6 +15,7 @@
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.model.CssdServiceDepts;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
@@ -593,4 +594,24 @@
 			ex.printStackTrace();
 		}
 	}
+	
+	/**
+	 * 添加该供应室服务所有临床科室
+	 * @param orgUnitCoding 供应室科室编码
+	 * @param orgUnitName 供应室科室名称
+	 * @return int
+	 */
+	public boolean addServiceAllClinicOrgUnit(String orgUnitCoding,String orgUnitName){
+		String sql = "insert into CssdServiceDepts(cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
+				+ "select '" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
+				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+				+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "');"
+				
+				+ "insert into CssdServiceDepts(cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
+				+ "select '" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
+				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+				+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "');"
+				;
+		return objectDao.excuteSQL(sql);
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java
===================================================================
diff -u -r12331 -r15241
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java	(.../SupplyRoomConfigTableManager.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java	(.../SupplyRoomConfigTableManager.java)	(revision 15241)
@@ -116,4 +116,18 @@
 		return true;
 	}
 	
+	/**
+	 * 添加该供应室服务所有临床科室(增量添加)
+	 * @param orgUnitCoding 供应室科室编码
+	 * @param orgUnitName 供应室科室名称
+	 * @return json格式
+	 */
+	public String addServiceAllClinicOrgUnit(String orgUnitCoding,String orgUnitName){
+		if(supplyRoomConfigManager.addServiceAllClinicOrgUnit(orgUnitCoding, orgUnitName)){
+			return "操作成功";
+		}else{
+			return "操作失败";
+		}
+	}
+	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r15121 -r15241
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15121)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15241)
@@ -38,6 +38,17 @@
 	}
 };
 
+/**
+ * 添加该供应室服务所有临床科室
+ * @param orgUnitCoding 供应室科室编码
+ * @param orgUnitName 供应室科室名称
+ */
+function addServiceAllClinicOrgUnit(orgUnitCoding,orgUnitName){
+	SupplyRoomConfigTableManager.addServiceAllClinicOrgUnit(orgUnitCoding,orgUnitName,function(message){
+		showResult(message);
+	});
+}
+
 function setRecordSequence(store){
 	for(var i=0;i<store.getCount();++i){
 		var record = store.getAt(i);
@@ -200,7 +211,7 @@
 		reader : rd
 	});
 	
-	
+	//一级供应室配置的表格列头
 	var cm = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
@@ -216,10 +227,11 @@
 		menuDisabled : true
 	},{
 		id : 'deleteItem',
-		header:'删除',
+		header:'操作',
 		width : 100,
 		renderer: function(v,p,record){
-			var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"removeGridItem() \">";
+			var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" title=\"删除\" onclick=\"removeGridItem() \">";
+			str += "&nbsp;&nbsp;<img src=" + WWWROOT + '/images/web/arrow_next.png'+" title=\"服务全部临床科室\" onclick=\"addServiceAllClinicOrgUnit('"+record.data["departId"]+"','"+record.data["name"]+"') \">";
 			return str;
 		},
 		menuDisabled:true,
@@ -245,6 +257,7 @@
 		width : 100,
 		renderer: function(v,p,record){
 			var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"removeGridItem2() \">";
+			str += "&nbsp;&nbsp;<img src=" + WWWROOT + '/images/web/arrow_next.png'+" title=\"服务全部临床科室\" onclick=\"addServiceAllClinicOrgUnit('"+record.data["departId"]+"','"+record.data["name"]+"') \">";
 			return str;
 		},
 		menuDisabled : true,