Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
===================================================================
diff -u -r29884 -r30265
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 29884)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 30265)
@@ -83,56 +83,6 @@
 		});
 }
 
-//选择科室
-function openSelectReceiverOrganization(departNames,departCodes){
-	var param = null;
-	//两个都不为空
-	if(!Ext.isEmpty(departNames) && !Ext.isEmpty(departCodes)){
-		param = {
-			departNames:departNames,
-			departCodes:departCodes,
-			allowNull : true,
-			onlyOneOrg : true,
-			resultType : 'code',
-			tabType : 'orgUnit',
-			sameLevel : 'yes',
-			range : 'all'
-		};
-	}else{
-		param = {
-			allowNull : true,
-			onlyOneOrg : true,
-			resultType : 'code',
-			tabType : 'orgUnit',
-			sameLevel : 'yes',
-			range : 'all'
-		};
-	}
-	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
-    
-	if(selectedOrgUnitArray == undefined){
-    	return;
-    }else if(selectedOrgUnitArray[0] !== undefined){
-    	var tem = selectedOrgUnitArray[0];
-    	top.Ext.getCmp("departCodes").setValue(tem);
-		top.Ext.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
-    }else {
-    	var loop = setInterval(function() {
-              if(selectedOrgUnitArray.closed) {
-                clearInterval(loop);
-
-		    	var returnValue = selectedOrgUnitArray.returnValue || [];
-
-		    	if(returnValue.length > 0){
-		    		var tem = returnValue[0];
-			    	top.Ext.getCmp("departCodes").setValue(tem);
-	    			top.Ext.getCmp("departNames").setValue(returnValue[1]);
-		    	}
-              }
-        },500);
-    }
-}
-
 var formDefinitionItemRecord = Ext.data.Record.create([
 	{name : 'id'},
 	{name : 'name'},
@@ -649,6 +599,16 @@
  * @param id
  */
 function addFormDefinition(id) {
+	//处理科室
+	var departInfoStore = new Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/rinserAction!getDepartmentInfo.do',
+			method : "POST"
+		}),
+		reader : new top.Ext.data.JsonReader({
+			fields : [ "orgUnitCoding", "orgUnitName"]
+		})
+	});
 	var formPanel = new top.Ext.FormPanel({
 		id : 'formDefinitionForm',
 		frame : true,
@@ -917,7 +877,7 @@
 			labelWidth : 80,
 			items:[{
 				xtype : 'textfield',
-				fieldLabel : "科室",
+				fieldLabel : "录入科室",
 				name : "departNames",
 				id : "departNames",
 				readOnly:true,
@@ -937,8 +897,36 @@
 				}
 			}]
         },{
+			xtype:'hidden',
+			id:'handleDepartCoding',
+			name:'handleDepartCoding'
+		},{
 			columnWidth : .5,
 			layout : 'form',
+			labelWidth : 80,
+			items:[{
+				xtype : 'combo',
+				fieldLabel : '处理科室',
+				id : 'handleDepart',
+				name : 'handleDepart',
+				width : 120,
+				valueField : 'orgUnitName',
+				displayField : 'orgUnitName',
+				store : departInfoStore,
+				forceSelection : true,
+				editable:false,
+				triggerAction : 'all',
+				allowBlank : false,
+				anchor : '95%',
+				listeners : {
+					select : function(combo, record, index) {
+						top.Ext.getCmp('handleDepartCoding').setValue((record.data.orgUnitCoding));
+					}
+				}
+			}]
+		},{
+			columnWidth : .5,
+			layout : 'form',
 			hidden : false,
 			id : 'showSterNameAndFre_id',
 			labelWidth : 80,
@@ -1114,11 +1102,11 @@
 	var formDefinitionWin = new top.Ext.Window( {
 		id : 'formDefinitionWin',
 		title : entityName + '信息',
-		width : 750,
+		width : 760,
 		border : false,
-		modal : true,
-		heigth :800,
-		plain : true,
+		modal : false,
+		plain : false,
+		height:640,
 		buttonAlign :'center',
 		items : [{
 			layout : 'column',
@@ -1133,7 +1121,7 @@
 						title : entityName + '元素列表',
 						width : 740,
 						height : 400,
-						border  : true,
+						border  : false,
 						frame : false,
 						selModel : new top.Ext.grid.RowSelectionModel({
 							singleSelect : false
@@ -1167,7 +1155,7 @@
 									valueField : 'value',
 									displayField : 'value',
 									allowBlank : false,
-									width:80,
+									width:75,
 									editable : false,
 									store : new top.Ext.data.SimpleStore({
 										fields : [ 'value' ],
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
===================================================================
diff -u -r30156 -r30265
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 30156)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 30265)
@@ -73,9 +73,16 @@
         showResult('请选择一个科室');
         return
     }
+    if (top.Ext4.getCmp("departNames") && top.Ext4.getCmp("departCodes")) {
+        top.Ext4.getCmp("departNames").setValue(nameArr.join(';'));
+        top.Ext4.getCmp("departCodes").setValue(codeArr.join(';'));
+    }
 
-    top.Ext4.getCmp("departNames").setValue(nameArr.join(';'));
-    top.Ext4.getCmp("departCodes").setValue(codeArr.join(';'));
+    if (top.Ext.getCmp("departNames") && top.Ext.getCmp("departCodes")) {
+        top.Ext.getCmp("departNames").setValue(nameArr.join(';'));
+        top.Ext.getCmp("departCodes").setValue(codeArr.join(';'));
+    }
+
     departWin.close();
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp
===================================================================
diff -u -r29513 -r30265
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp	(.../qualityMonitoringDefinitionView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp	(.../qualityMonitoringDefinitionView.jsp)	(revision 30265)
@@ -11,12 +11,14 @@
 </head>
 <body>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/QualityMonitoringDefinitionTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="qualityMonitoringDefinitionView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript">