Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
===================================================================
diff -u -r12677 -r12745
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js	(.../cssdServiceDeptsForm.js)	(revision 12677)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js	(.../cssdServiceDeptsForm.js)	(revision 12745)
@@ -54,6 +54,7 @@
 						xtype : 'textfield',
 						fieldLabel : "供应室编码",
 						value:currentOrgUnitCode,
+						readOnly:true,
 						allowBlank : false,
 						blankText : '请输入名称!',
 						name : "cssdOrgUnitCode",
@@ -71,6 +72,7 @@
 						name : "cssdOrgUnitName",
 						id : "cssdOrgUnitName",
 						value:currentOrgUnitName,
+						readOnly:true,
 						anchor : '100%',
 			    		listeners:{
 			    			change:function(field,nV,oV){
@@ -205,12 +207,16 @@
 					waitMsg : '正在保存数据，请稍候',
 					waitTitle : '提交表单',
 					success : function(form, action) {
-						cssdServiceDeptsWin.close();
-						showResult('保存成功');
-						grid.dwrReload();
+						if(action.result.success == true){
+							cssdServiceDeptsWin.close();
+							showResult('保存成功');
+							grid.dwrReload();
+						}else{
+							showResult(action.result.message);
+						}
 					},
 					failure : function(form, action) {
-						showResult('failure = ' + action.result.message,'error');
+						showResult(action.result.message);
 						top.Ext.getCmp('saveBtn').enable();
 					}
 				});
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r12740 -r12745
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 12740)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 12745)
@@ -639,7 +639,7 @@
 					objectDao.saveOrUpdate(cssdServiceDepts);
 					result.add(orgUnit);
 				}else{
-					throw new RuntimeException(cssd.getName() + "已配置服务" + orgUnit.getName());
+					throw new RuntimeException(cssd.getName() + "已配置" + tousseType + "服务" + orgUnit.getName());
 				}
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
===================================================================
diff -u -r12675 -r12745
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js	(.../cssdHandleToussesForm.js)	(revision 12675)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js	(.../cssdHandleToussesForm.js)	(revision 12745)
@@ -51,6 +51,7 @@
 						xtype : 'textfield',
 						fieldLabel : "科室编码",
 						value:currentOrgUnitCode,
+						readOnly:true,
 						allowBlank : false,
 						blankText : '请输入名称!',
 						name : "orgUnitCode",
@@ -68,6 +69,7 @@
 						name : "orgUnitName",
 						id : "orgUnitName",
 						value:currentOrgUnitName,
+						readOnly:true,
 						anchor : '100%',
 			    		listeners:{
 			    			change:function(field,nV,oV){
@@ -193,7 +195,7 @@
 						}
 					},
 					failure : function(form, action) {
-						showResult('failure = ' + action.result.message,'error');
+						showResult(action.result.message);
 						top.Ext.getCmp('saveBtn').enable();
 					}
 				});
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
===================================================================
diff -u -r12740 -r12745
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 12740)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 12745)
@@ -196,16 +196,22 @@
 			List<OrgUnit> clinicOrgList = new ArrayList<OrgUnit>();
 			clinicOrgList.add(clinicOrg);
 			
+			HttpServletResponse httpServletResponse = StrutsParamUtils
+					.getResponse();
+			httpServletResponse.setCharacterEncoding("UTF-8");
 			try {
 				orgUnitManager.saveOrUpdateCssdServiceDepts(cssd , clinicOrgList , cssdServiceDepts.getTousseType());
-				HttpServletResponse httpServletResponse = StrutsParamUtils
-					.getResponse();
 				jsonObject.put("success", true);
-				httpServletResponse.getWriter().print(jsonObject);
 			} catch (Exception e) {
 				jsonObject.put("success", false);
-				jsonObject.put("message", "保存供应室服务临床科室失败:" + e.getMessage());
+				jsonObject.put("message", "保存失败:" + e.getMessage());
 			}
+			try {
+				httpServletResponse.getWriter().print(jsonObject);
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}else{
 			jsonObject.put("success", false);
 			jsonObject.put("message", "保存供应室服务临床科室失败,配置数据为空!");
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action/CssdHandleToussesAction.java
===================================================================
diff -u -r12740 -r12745
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action/CssdHandleToussesAction.java	(.../CssdHandleToussesAction.java)	(revision 12740)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/action/CssdHandleToussesAction.java	(.../CssdHandleToussesAction.java)	(revision 12745)
@@ -107,16 +107,22 @@
 			List<TousseDefinition> tousseDefinitionList = new ArrayList<TousseDefinition>();
 			tousseDefinitionList.add(tousseDefinition);
 			
+			HttpServletResponse httpServletResponse = StrutsParamUtils
+					.getResponse();
+			httpServletResponse.setCharacterEncoding("UTF-8");
 			try {
 				tousseDefinitionManager.saveOrUpdateCssdHandleTousseDefinitions(cssd, tousseDefinitionList);
-				HttpServletResponse httpServletResponse = StrutsParamUtils
-					.getResponse();
 				jsonObject.put("success", true);
-				httpServletResponse.getWriter().print(jsonObject);
 			} catch (Exception e) {
 				jsonObject.put("success", false);
-				jsonObject.put("message", "保存供应室处理的器械包配置失败:" + e.getMessage());
+				jsonObject.put("message", "保存失败:" + e.getMessage());
 			}
+			try {
+				httpServletResponse.getWriter().print(jsonObject);
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}else{
 			jsonObject.put("success", false);
 			jsonObject.put("message", "保存供应室处理的器械包配置失败,配置数据为空!");
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r12740 -r12745
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12740)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12745)
@@ -1913,7 +1913,7 @@
 		}
 		
 		if(StringUtils.isNotBlank(cssdHandleTousses.getOrgUnitCode())){
-			sql += " and orgUnitCode = '" + cssdHandleTousses.getOrgUnitId() + "'";
+			sql += " and orgUnitCode = '" + cssdHandleTousses.getOrgUnitCode() + "'";
 		}
 
 		if(cssdHandleTousses.getTousseDefinitionId() != null){