Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r27538 -r27680
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 27538)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 27680)
@@ -115,5 +115,7 @@
   //是否启用灭菌效果监测报表
   enableSterilizationEffectMonitorReport : true,
   //禁用基数限制
-  disableCardinalNumLimit:true
+  disableCardinalNumLimit:true,
+  //手动设置供应室服务临床科室
+  manuallySetUpSupplyRoomServiceDepts:true
 }
\ No newline at end of file
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r27495 -r27680
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 27495)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 27680)
@@ -49,6 +49,7 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.ConfigUtils;
 import com.forgon.tools.util.SqlUtils;
 import com.forgon.treenode.ext.model.ExtCheckTreeNode;
 import com.forgon.treenode.ext.model.ExtTreeNode;
@@ -459,34 +460,38 @@
 			sql += ")";
 			objectDao.executeUpdate(sql);
 			
-			//2.查找出一级供应室
-			ResultSet rs = objectDao.executeSql("select orgUnitCoding,orgUnitName from SupplyRoomConfig where supplyRoomType='1'");;
-			try{
-				if(rs.next()){
-					String cssdOrgUnitCoding = rs.getString("orgUnitCoding");
-					String cssdOrgUnitName = rs.getString("orgUnitName");
-					
-					//3.新建一级供应室对器械包和一次性物品服务该科室
-					CssdServiceDepts cssdServiceDepts = new CssdServiceDepts();
-					cssdServiceDepts.setCssdOrgUnitCode(cssdOrgUnitCoding);
-					cssdServiceDepts.setCssdOrgUnitName(cssdOrgUnitName);
-					cssdServiceDepts.setClinicOrgUnitCode(orgUnit.getOrgUnitCoding());
-					cssdServiceDepts.setClinicOrgUnitName(orgUnit.getName());
-					cssdServiceDepts.setTousseType(CssdServiceDepts.TOUSSETYPE_TOUSSE);
-					objectDao.saveOrUpdate(cssdServiceDepts);
-					
-					cssdServiceDepts = new CssdServiceDepts();
-					cssdServiceDepts.setCssdOrgUnitCode(cssdOrgUnitCoding);
-					cssdServiceDepts.setCssdOrgUnitName(cssdOrgUnitName);
-					cssdServiceDepts.setClinicOrgUnitCode(orgUnit.getOrgUnitCoding());
-					cssdServiceDepts.setClinicOrgUnitName(orgUnit.getName());
-					cssdServiceDepts.setTousseType(CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS);
-					objectDao.saveOrUpdate(cssdServiceDepts);
+			// ZSYKZX-118 同步组织机构时，增加参数控制是否自动添加相关配置
+			Boolean manuallySetUpSupplyRoomServiceDepts = ConfigUtils.getSystemSetConfigByNameBool("manuallySetUpSupplyRoomServiceDepts", false);
+			if(!manuallySetUpSupplyRoomServiceDepts){
+				//2.查找出一级供应室
+				ResultSet rs = objectDao.executeSql("select orgUnitCoding,orgUnitName from SupplyRoomConfig where supplyRoomType='1'");;
+				try{
+					if(rs.next()){
+						String cssdOrgUnitCoding = rs.getString("orgUnitCoding");
+						String cssdOrgUnitName = rs.getString("orgUnitName");
+						
+						//3.新建一级供应室对器械包和一次性物品服务该科室
+						CssdServiceDepts cssdServiceDepts = new CssdServiceDepts();
+						cssdServiceDepts.setCssdOrgUnitCode(cssdOrgUnitCoding);
+						cssdServiceDepts.setCssdOrgUnitName(cssdOrgUnitName);
+						cssdServiceDepts.setClinicOrgUnitCode(orgUnit.getOrgUnitCoding());
+						cssdServiceDepts.setClinicOrgUnitName(orgUnit.getName());
+						cssdServiceDepts.setTousseType(CssdServiceDepts.TOUSSETYPE_TOUSSE);
+						objectDao.saveOrUpdate(cssdServiceDepts);
+						
+						cssdServiceDepts = new CssdServiceDepts();
+						cssdServiceDepts.setCssdOrgUnitCode(cssdOrgUnitCoding);
+						cssdServiceDepts.setCssdOrgUnitName(cssdOrgUnitName);
+						cssdServiceDepts.setClinicOrgUnitCode(orgUnit.getOrgUnitCoding());
+						cssdServiceDepts.setClinicOrgUnitName(orgUnit.getName());
+						cssdServiceDepts.setTousseType(CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS);
+						objectDao.saveOrUpdate(cssdServiceDepts);
+					}
+				}catch(Exception e){
+					e.printStackTrace();
+				}finally{
+					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
-			}catch(Exception e){
-				e.printStackTrace();
-			}finally{
-				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
 		} else {
 			//修改科室名称处理