Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp
===================================================================
diff -u -r29513 -r31216
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp	(.../satisfactionSurveyTemplateView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp	(.../satisfactionSurveyTemplateView.jsp)	(revision 31216)
@@ -13,6 +13,7 @@
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript" src="${ctx }/ext/expand/js/RowExpander.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.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/SatisfactionSurveyTemplateTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
===================================================================
diff -u -r30265 -r31216
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 30265)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 31216)
@@ -59,35 +59,58 @@
 }
 
 //保存选择的科室和编码
-function saveDepartNameAndCode() {
+function saveDepartNameAndCode(formName) {
     var nameArr = [];
     var codeArr = [];
 
-    for (var i = 0; i < departListStore.getCount(); i++) {
-        var record = departListStore.getAt(i);
-        nameArr[i] = record.get('name');
-        codeArr[i] = record.get('departCode');
-    }
+    if (formName == 'satisfactionSurveyTemplateForm') {
+        for (var i = 0; i < departListStore.getCount(); i++) {
+            var record = departListStore.getAt(i);
+            var name = record.get('name');
+            var departCode = record.get('departCode');
+            if (record.get('departCode').indexOf('ORGUNIT_') == -1) {
+                departCode = 'ORGUNIT_' + record.get('departCode');
+            }
+            nameArr[i] = name;
+            codeArr[i] = departCode;
+        }
 
-    if (nameArr.length == 0 || codeArr.length == 0) {
-        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(';'));
-    }
+        if (nameArr.length == 0 || codeArr.length == 0) {
+            showResult('请选择一个科室');
+            return
+        }
 
-    if (top.Ext.getCmp("departNames") && top.Ext.getCmp("departCodes")) {
-        top.Ext.getCmp("departNames").setValue(nameArr.join(';'));
-        top.Ext.getCmp("departCodes").setValue(codeArr.join(';'));
+        if (top.Ext.getCmp("readersForDisplay") && top.Ext.getCmp("readers")) {
+            top.Ext.getCmp("readersForDisplay").setValue(nameArr.join(';'));
+            top.Ext.getCmp("readers").setValue(codeArr.join(';'));
+        }
+    } else {
+        for (var i = 0; i < departListStore.getCount(); i++) {
+            var record = departListStore.getAt(i);
+            nameArr[i] = record.get('name');
+            codeArr[i] = record.get('departCode');
+        }
+
+        if (nameArr.length == 0 || codeArr.length == 0) {
+            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(';'));
+        }
+
+        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();
 }
 
 //打开选择科室的窗口
-function openSelectReceiverOrganization(departNames, codes) {
+function openSelectReceiverOrganization(departNames, codes, formName) {
     var departJsonStore = new top.Ext4.data.Store({
         proxy: {
             type: 'ajax',
@@ -253,7 +276,7 @@
             id: 'confirmBtn',
             text: '确定',
             handler: function () {
-                saveDepartNameAndCode();
+                saveDepartNameAndCode(formName);
             }
         }, {
             text: '取消',
Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
===================================================================
diff -u -r27321 -r31216
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 27321)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 31216)
@@ -222,7 +222,17 @@
 									click : function(){
 										var departNames = top.Ext.getCmp('readersForDisplay').getValue();
 										var departcodes = top.Ext.getCmp('readers').getValue();
-										openSelectReceiverOrganization(departNames,departcodes);
+										var codes = [];
+										for(var i=0;i<departcodes.split(';').length;i++){
+											if(departcodes.split(';')[i] !== '' && departcodes.split(';')[i] !== undefined){
+												var code = departcodes.split(';')[i];
+												if(code.split('_').length > 1){
+													code = code.split('_')[1];
+												}
+												codes.push(code);
+											}
+										}
+										openSelectReceiverOrganization(departNames,codes.join(';'),'satisfactionSurveyTemplateForm');
 									}
  								}
  							}]
@@ -507,102 +517,6 @@
 	return node;
 }
 
-function openSelectReceiverOrganization(departNames,departCodes){
-	var param = null;
-	var temp;
-	if(departCodes.charAt(0)==";" && departCodes.charAt(departCodes.length-1)==";"){
-		temp = departCodes.substring(1,departCodes.length-1);
-	}else{
-		temp = departCodes;
-	}
-	//两个都不为空
-	if(!Ext.isEmpty(departNames) && !Ext.isEmpty(departCodes)){
-		param = {
-			departNames:departNames,
-			departCodes:temp,
-			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");
-	//ORGUNIT_3306;ORGUNIT_3219,口腔科;妇科
-
-	if(selectedOrgUnitArray == undefined){
-    	return;
-    }else if(selectedOrgUnitArray[0] !== undefined){
-    	var tem = selectedOrgUnitArray[0];
-    	var arr = tem.split(";");
-    	var str = "";
-    	if(arr.length>0){
-    		for(var i=0;i<arr.length;i++){
-    			//如果已经有这个东西了，就不要再加了
-    			if(arr[i].indexOf('ORGUNIT_')==-1){
-    				if(i==arr.length-1){
-    					str +='ORGUNIT_'+arr[i];
-    				}else{
-    					str +='ORGUNIT_'+arr[i]+";";
-    				}
-    			}else{
-    				if(i==arr.length-1){
-    					str += arr[i];
-    				}else{
-    					str += arr[i]+";";
-    				}
-    			}
-    		}
-    	}
-    	top.Ext.getCmp("readers").setValue(str);
-    	top.Ext.getCmp("readersForDisplay").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];
-			    	var arr = tem.split(";");
-			    	var str = "";
-			    	if(arr.length>0){
-			    		for(var i=0;i<arr.length;i++){
-			    			//如果已经有这个东西了，就不要再加了
-			    			if(arr[i].indexOf('ORGUNIT_')==-1){
-			    				if(i==arr.length-1){
-			    					str +='ORGUNIT_'+arr[i];
-			    				}else{
-			    					str +='ORGUNIT_'+arr[i]+";";
-			    				}
-			    			}else{
-			    				if(i==arr.length-1){
-			    					str += arr[i];
-			    				}else{
-			    					str += arr[i]+";";
-			    				}
-			    			}
-			    		}
-			    	}
-			    	top.Ext.getCmp("readers").setValue(str);
-			    	top.Ext.getCmp("readersForDisplay").setValue(returnValue[1]);
-		    	}
-              }
-        },500);
-    }
-}
-
 function deleteGiveBackColumnTreeItem(clickNode){
 	if(clickNode.leaf) {
 		clickNode.remove();