Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r27242 -r27425
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 27242)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 27425)
@@ -15,7 +15,8 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
-<script type="text/javascript" src="supplyRoomTypeForm.js"></script>
+<script type="text/javascript" src="setMergeApplicationDeparts.js"></script>
+<script type="text/javascript" src="supplyRoomTypeForm.js"></script> 
 <!-- 支持多选的下拉框 -->
 <script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js"></script>
 <style type="text/css">
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/setMergeApplicationDeparts.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/setMergeApplicationDeparts.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/setMergeApplicationDeparts.js	(revision 27425)
@@ -0,0 +1,337 @@
+//科室与任务组grid表格的数据源
+var select_DepartsGridStore;
+//删除
+function removeSelect_DepartItem(p) {
+	var records = top.Ext.getCmp('select_DepartsGrid').getSelectionModel().getSelections();
+	if (records.length > 0) {
+		select_DepartsGridStore.remove(records[0]);
+	}
+}
+//删除多个
+function removeGridItem(supplyRoom){
+	var obj = top.Ext.getCmp('select_DepartsGrid');
+	var rows = obj.getSelectionModel().getSelections();// 返回值为
+	var store = obj.getStore();
+	if (rows.length == 0) {
+		showResult("请选择要删除的容器！");
+		return false;
+	}
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			store.remove(rows[i]);
+		}
+	}
+};
+/**
+ * 调用的入口函数、设置外来器械包的处理科室与任务组
+ * @param extHiddenElementId 控件id,即隐藏域的id	
+ * @param extComboElementId 控件id,即下拉框的id	
+ * @param departsCodes 页面上传回来的科室编码，多个情况用","
+ */
+function setDepartOrgUnit(extHiddenElementId, extComboElementId, departsCodes) {
+	var departsCodesArr = [];
+	if(departsCodes == ""){
+		departsCodesArr = "";
+	}else{
+		var departsCodes =  JSON.parse(departsCodes);
+		for(var n = 0;n < departsCodes.length;n++){
+			departsCodesArr.push(departsCodes[n].mergeApplicationDepartsCode);
+		}
+		
+		if (departsCodesArr.length != 0) {
+			departsCodesArr = departsCodesArr.join(",");
+		}
+	}
+	
+	//科室的窗口
+	var formWindowDeparts;
+	//确定保存
+	function saveSelect(extHiddenElementId, extComboElementId) {
+		var valueArr = [];
+		var showArr = [];
+		for (var i = 0; i < select_DepartsGridStore.getCount(); i++) {
+			var record = select_DepartsGridStore.getAt(i);
+			var obj = {};
+			obj['mergeApplicationDepartsCode'] = record.get('departCode');
+			obj['mergeApplicationDepartsName'] = record.get('departName');
+			valueArr.push(obj);
+			showArr.push(record.get('departName'));
+			
+		}
+		Ext.getCmp(extHiddenElementId).setValue(JSON.stringify(valueArr));
+		Ext.getCmp(extComboElementId).setValue(showArr.join(";"));
+		select_DepartsGridStore.removeAll();
+		formWindowDeparts.close();
+	}
+
+	//科室record
+	var departAndTaskGroupRecord = Ext.data.Record.create([{
+			name: 'departCode'
+		},
+		{
+			name: 'departName'
+		}
+	]);
+
+	/**
+	 * 添加所选择的科室名称
+	 */
+	function addSelect_Depart(name,departId) {
+		var departCode = top.Ext.getCmp('select_departCode').getValue();
+		var departName = top.Ext.getCmp('select_departCode').getRawValue();
+		if (departCode || (name != undefined && departId != undefined)) {
+			var isExist = false;
+			var isExistAll = false;
+			for (var i = 0; i < select_DepartsGridStore.getCount(); i++) {
+				var record = select_DepartsGridStore.getAt(i);
+				var tempName = record.get('departCode');
+				if (tempName == departCode ||  tempName == departId) {
+					isExist = true;
+					break;
+				}
+			}
+			if (!isExist) {
+				if( name != undefined && departId != undefined){
+					var record2 = new departAndTaskGroupRecord({
+						departCode: departId,
+						departName: name
+					});
+					select_DepartsGridStore.add(record2);
+				}else{
+					var record = new departAndTaskGroupRecord({
+						departCode: departCode,
+						departName: departName
+					});
+					select_DepartsGridStore.add(record);
+				}
+				
+				top.Ext.getCmp('select_departCode').setValue('');
+				top.Ext.getCmp('select_departCode').setRawValue('');
+			}else {
+				if(name != undefined && departId != undefined){
+					showResult('科室：['+name+'] 已存在！');
+				}else{
+					showResult("供应编码:" + departCode + ",供应室名称:" + departName + "已添加,请不要重复添加！");
+				}
+				
+			}
+		} else {
+			showResult("请选择供应室");
+		}
+	}
+	select_DepartsGridStore = new top.Ext.data.Store({
+		reader: departAndTaskGroupRecord
+	});
+	var smCheckbox = new top.Ext.grid.CheckboxSelectionModel({
+		singleSelect : false,
+		checkOnly: true
+	});
+	var cm = new top.Ext.grid.ColumnModel([
+		smCheckbox,
+	{
+		header: "科室编码",
+		width: 140,
+		dataIndex: 'departCode'
+	}, {
+		header: "科室名称",
+		width: 140,
+		dataIndex: 'departName'
+	}, {
+		header: '删除',
+		width: 40,
+		menuDisabled: true,
+		dataIndex: 'button',
+		renderer: function (v, p, record, index) {
+			return "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"getCurrentTab().removeSelect_DepartItem(" + index + ");\" >";
+		}
+	}]);
+
+	//科室数据源
+	var departJsonStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [{
+				name: 'departCode',
+				mapping: 'id'
+			},
+			{
+				name: 'name',
+				mapping: 'name'
+			}
+		])
+	});
+
+	//顶部的工具栏
+	var tbar = [{
+		text: '选择科室'
+	}, {
+		xtype: 'combo',
+		id: 'select_departCode',
+		name: 'select_departCode',
+		queryParam: 'spell',
+		fieldLabel: '科室名称',
+		minChars: 0,
+		valueField: 'departId',
+		displayField: 'name',
+		anchor: '100%',
+		width: 200,
+		store: departJsonStore,
+		lazyInit: true,
+		triggerAction: 'all',
+		hideTrigger: true,
+		typeAhead: false,
+		allowBlank: true,
+		listeners: {
+			select: function (combo, record, index) {
+				var tem = record.data.departCode;
+				var name = record.data.name;
+				top.Ext.getCmp('select_departCode').setValue(tem);
+				top.Ext.getCmp('select_departCode').setRawValue(name);
+			}
+		}
+	}, {
+		text: '添加',
+		iconCls : 'btn_ext_add',
+		handler: function () {
+			addSelect_Depart();
+		}
+	},{
+		text: '添加全部',
+		iconCls : 'icon_systemset',
+		handler: function () {
+			Ext.Ajax.request({
+				url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
+				success : function(response, options) {
+					var result = Ext.decode(response.responseText);
+					var lenth = result.data.length;
+					for(var index = 0;index < lenth;index++){
+						var name = result.data[index].name; 
+						var departId = result.data[index].id;
+						addSelect_Depart(name,departId);
+						//addGridItem(supplyRoomStoreApply,name,departId,"");
+					}
+				},
+				failure : function(response, options) {
+				}
+			});
+		}
+	},{
+		text: '删除',
+		iconCls : 'btn_ext_application_del',
+		handler : function() {
+			removeGridItem("select_DepartsGrid");
+		}
+	},{
+		text: '删除全部',
+		iconCls : 'btn_ext_application_del',
+		handler : function() {
+			top.Ext.MessageBox.confirm("请确认","确定要删除所有科室吗？",function(btn){
+				if(btn == "yes"){
+					select_DepartsGridStore.removeAll();
+				}
+			});
+		}
+	}
+];
+	
+	var select_DepartsGridStoreFormObj = new top.Ext.FormPanel({
+		id: 'departAndTaskGroupForm',
+		frame: true,
+		labelAlign: 'right',
+		labelSeparator: '：',
+		bodyStyle: 'padding:5px 5px 0px 5px',
+		autoWidth: true,
+		autoHeight: true,
+		autoScroll: true,
+		items: [{
+			layout: 'column',
+			items: [{
+				columnWidth: 1,
+				layout: 'form',
+				items: [
+					new top.Ext.grid.GridPanel({
+						id: 'select_DepartsGrid',
+						store: select_DepartsGridStore,
+						tbar: tbar,
+						cm: cm,
+						width: 140,
+						height: 240,
+						isCheckboxSelectionModel: true,
+						frame: false,
+						viewConfig: {
+							forceFit: true
+						},
+						bodyStyle: 'border:1px solid #afd7af',
+						anchor: '100%',
+						sm:smCheckbox,
+						selModel: new top.Ext.grid.RowSelectionModel({
+							singleSelect: false,
+							checkOnly: true
+						})
+					})
+				]
+			}]
+		}],
+		buttons: [{
+			id: 'saveBtn2',
+			text: '确定',
+			handler: function () {
+				saveSelect(extHiddenElementId, extComboElementId);
+			}
+		}, {
+			id: 'cancleBtn2',
+			text: '取消',
+			handler: function () {
+				select_DepartsGridStore.removeAll();
+				formWindowDeparts.close();
+			}
+		}]
+	});
+
+	formWindowDeparts = new top.Ext.Window({
+		id: 'formWindowDepartAndTaskGroupWin',
+		layout: 'fit',
+		title: '选择科室',
+		width: 650,
+		modal: true,
+		autoHeight: true,
+		border: false,
+		plain: true,
+		items: [select_DepartsGridStoreFormObj]
+	});
+	formWindowDeparts.show();
+	//根据传递的科室编码获取科室信息
+	if (departsCodesArr.length > 0) {
+		//departsCodesArr = departsCodesArr.replace(/;/g,",");
+		Ext.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadOrgUnitInfoByOrgUnitCodings.do',
+			params: {
+				departCodes: departsCodesArr
+			},
+			success: function (response, options) {
+				var result = Ext.decode(response.responseText);
+				var data = result.data;
+				if (result.success) {
+					if (data) {
+						for (var i = 0; i < data.length; i++) {
+							var record = new departAndTaskGroupRecord({
+								departCode: data[i]["departCode"],
+								departName: data[i]["departName"]
+							});
+							select_DepartsGridStore.add(record);
+						}
+					}
+				} else {
+					showResult("加载科室信息" + result.message)
+				}
+			},
+			failure: function (response, options) {
+				showResult("加载科室信息报错");
+			}
+		})
+	};
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r26853 -r27425
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 26853)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 27425)
@@ -827,12 +827,12 @@
 		          				  forceSelection : true,
 								  triggerAction : 'all',
 		             			  anchor : '100%',
-		             			  store : new Ext.data.SimpleStore( {
+		             			  store : new Ext.data.SimpleStore({
 											fields : [ 'name'],
 											data : [['是'],['否']]
 									  })
 								}]
-		             	  },{
+		             	  },/* {
 		             		  layout : 'form',
 		             		  labelWidth : 180,
 		             		  columnWidth : .25,
@@ -866,7 +866,7 @@
 											}
 									  }
 								}]
-		             	  },{
+		             	  } ,*/{
 
 		             		  layout : 'form',
 		             		  columnWidth : .25,
@@ -989,20 +989,6 @@
 										}
 							       }]
 		             	  },{
-		                 	  layout:'form',
-		                 	  labelWidth : 180,
-		                 	  columnWidth: .25,
-		          		      items:[{
-				        	        	 xtype :'numberfield',
-				        	        	 fieldLabel :'一次性物品的预警期(天数)',
-				        	        	 id :'disposableGoodsWarningDate',
-				        	        	 name :'disposableGoodsWarningDate',
-				        	        	 allowDecimals : false,
-				        	        	 emptyText :'天数',
-				        	        	 anchor : '100%',
-				        	        	 allowBlank : true
-		          		      }]
-		             	  },{
 		             		  layout:'form',
 		             		  labelWidth : 180,
 		         		  	  columnWidth: .25,
@@ -1026,6 +1012,20 @@
 										triggerAction : 'all'
 							       }]
 		             	  },{
+		                 	  layout:'form',
+		                 	  labelWidth : 180,
+		                 	  columnWidth: .25,
+		          		      items:[{
+				        	        	 xtype :'numberfield',
+				        	        	 fieldLabel :'一次性物品的预警期(天数)',
+				        	        	 id :'disposableGoodsWarningDate',
+				        	        	 name :'disposableGoodsWarningDate',
+				        	        	 allowDecimals : false,
+				        	        	 emptyText :'天数',
+				        	        	 anchor : '100%',
+				        	        	 allowBlank : true
+		          		      }]
+		             	  },{
 		             		  layout : 'form',
 		             		  labelWidth : 180,
 		             		  columnWidth : .25,
@@ -1080,7 +1080,7 @@
 									triggerAction : 'all',
 									anchor : '100%'
 	                		  }]
-		             	  },{
+		             	  }/*, {
 		             		  layout:'form',
 							  labelWidth : fontSize == 12 ? 180 : 210,
 							  labelAlign:"right",
@@ -1105,7 +1105,7 @@
 											data : [['是'],['否']]
 									  })
 								}]
-		             	  },{
+		             	  } ,{
 	             		  	labelWidth : 180,
 	             		  	columnWidth : .25,
 		    				layout : 'form',
@@ -1155,10 +1155,158 @@
 		    						}
 		    					}
 		    				}]
-		             	  }
+		             	  } */
 					]
                 },{
 					xtype : "fieldset",
+					title : '合并申请单设置',
+					layout:'column',
+				    width : 1400,
+					height: 100,
+					// columnWidth : 1,
+					labelWidth : 95,
+					items : [
+						{
+						  layout : 'form',
+						  labelWidth : 180,
+						  columnWidth : .25,
+						  items : [{
+							  xtype : 'combo',
+							  valueField : 'name',
+							  displayField : 'name',
+							  mode : 'local',
+							  fieldLabel : '是否自动合并申请单',
+							  id : 'autoMergeApplication',
+							  name : 'autoMergeApplication',
+							  allowNegative : false,
+							  allowBlank : false,
+							  editable:false,
+							  forceSelection : true,
+							  triggerAction : 'all',
+							  anchor : '100%',
+							  store : new Ext.data.SimpleStore( {
+										fields : [ 'name'],
+										data : [['是'],['否']]
+								  }),
+								  listeners:{
+									  select : function (combo, record, index ){
+											if(combo.getRawValue() == '否'){
+												Ext.getCmp("isORAppFormMergeLabel").hide();
+												Ext.getCmp("noMergeApplicationTypesLabel").hide();
+												Ext.getCmp("autoMergeApplicationDeparts").hide();
+											}else{
+												Ext.getCmp("isORAppFormMergeLabel").show();
+												Ext.getCmp("noMergeApplicationTypesLabel").show();
+												Ext.getCmp("autoMergeApplicationDeparts").show();
+											}
+										}
+								  }
+							}]
+						}, {
+		             		  layout:'form',
+							  labelWidth : fontSize == 12 ? 180 : 210,
+							  labelAlign:"right",
+		         		  	  columnWidth: .25,
+		             		  id:'isORAppFormMergeLabel',
+		             		  items : [{
+		             			  xtype : 'combo',
+								  valueField : 'name',
+								  displayField : 'name',
+								  mode : 'local',
+		             			  fieldLabel : '手术室手工录入申请单合并',
+		             			  id : 'isORAppFormMerge',
+		             			  name : 'isORAppFormMerge',
+		             			  allowNegative : false,
+		          				  allowBlank : true,
+		          				  editable:false,
+		          				  forceSelection : true,
+								  triggerAction : 'all',
+		             			  anchor : '100%',
+		             			  store : new Ext.data.SimpleStore( {
+											fields : [ 'name'],
+											data : [['是'],['否']]
+									  })
+								}]
+		             	  } ,{
+	             		  	labelWidth : 180,
+	             		  	columnWidth : .25,
+		    				layout : 'form',
+		    				id : 'noMergeApplicationTypesLabel',
+		    				items : [{
+		    					xtype : 'multiSelect',
+		    					fieldLabel : "不合并的申请单类型",
+		    					valueField : 'value',
+		    					displayField : 'value',
+		    					store : noMergeApplicationTypesStore,
+		    					triggerAction : 'all',
+		    					id : 'noMergeApplicationTypes',
+		    					name : 'noMergeApplicationTypes',
+		    					readOnly:true,
+		    					mode : 'local',
+		    					anchor : '100%',
+		    					listeners: {
+		    						render: function(thiz) {
+		    							thiz.selectAll();
+		    						},
+		    						select: function (combo, record, index) {
+		    							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+		    							if (record.get('value') == '全部') {
+		    								if (record.get('checked')) {
+		    									combo.selectAll();
+		    								} else {
+		    									combo.deselectAll();
+		    								}
+		    							}
+		    							
+		    							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+		    							var selectAll = true;
+		    							combo.store.each(function(record) {
+		    								if (record.get('value') != '全部' && !record.get(this.checkField)) {
+		    									selectAll = false;
+		    									return;
+		    								}
+		    							}, combo);
+		    							
+		    							var all = combo.store.getAt(0);
+		    							if (selectAll) {
+		    								all.set(combo.checkField, true);
+		    							} else {
+		    								all.set(combo.checkField, false);
+		    							}
+		    							combo.setValue(combo.getCheckedValue());
+		    						}
+		    					}
+		    				}]
+		             	},{
+						    columnWidth : 1,
+						    layout : 'form',
+							labelWidth : 180,
+							labelAlign:"right",
+							id:"autoMergeApplicationDeparts",
+							items:[{
+									//用于保存时：传递所属科室编码
+									xtype : 'hidden',
+									id : 'autoMergeApplicationDepartsCodes',
+									name : 'autoMergeApplicationDepartsCodes'
+								},{
+									xtype : 'trigger',
+									fieldLabel : "自动合并申请单的科室",
+									allowBlank : true,
+									name : "autoMergeApplicationDepartsName",
+									id : "autoMergeApplicationDepartsName",
+									msgTarget:'side',
+									readOnly:true,
+									onTriggerClick : function(){
+										setDepartOrgUnit('autoMergeApplicationDepartsCodes' , 'autoMergeApplicationDepartsName' , Ext.getCmp('autoMergeApplicationDepartsCodes').getValue());
+									},
+									triggerClass : 'x-form-search-trigger',
+									anchor : '100%'
+						  }]
+						}
+						
+					]
+                },{
+					xtype : "fieldset",
 					title : '价格参数设置',
 					layout:'column',
 				    width : 1400,
@@ -2948,7 +3096,14 @@
             			ftApplyDepartment = Ext.getCmp("ftApplyDepartment").getValue();
             			ftApplyDepartmentCode = Ext.getCmp("ftApplyDepartmentCode").getValue();
             		}
-            		
+					
+					var mergeApplicationDepartNameAndCodeArr = "";
+					if(autoMergeApplication == "否" || autoMergeApplication == ""){
+						mergeApplicationDepartNameAndCodeArr = "";
+					}else{
+					    mergeApplicationDepartNameAndCodeArr = Ext.getCmp("autoMergeApplicationDepartsCodes").getValue();
+					}
+					
             		var ftDefaultPackageType = Ext.getCmp("ftDefaultPackageType").getValue();
             		var isORAppFormMerge = Ext.getCmp("isORAppFormMerge").getValue();
             		var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
@@ -3034,7 +3189,8 @@
 	                    	unitName : unitName,
 	                    	supplierCertificationExpTime : supplierCertificationExpTime, //供应商注册证预警期
 	                    	expensiveGoodsBillWarningTime : expensiveGoodsBillWarningTime,//高值耗材发票预警期
-	                    	noMergeApplicationTypes : noMergeApplicationTypes
+	                    	noMergeApplicationTypes : noMergeApplicationTypes,
+							mergeApplicationDepartArr:mergeApplicationDepartNameAndCodeArr //自动合并申请单的科室编码和科室名称
 	                    },
 	                    success : function(response, options) {
 	                    	var result = Ext.decode(response.responseText);
@@ -3178,14 +3334,28 @@
 				setFieldsHide(true);
 				Ext.getCmp('autoSignInvoice').setValue('否');
 			}
+			
 			if(supplyRoomConfig.autoMergeApplication){
 				Ext.getCmp('autoMergeApplication').setValue('是');
 				Ext.getCmp('noMergeApplicationTypes').setValue(supplyRoomConfig.noMergeApplicationTypes);
+				//自动合并申请单的科室
+				if(supplyRoomConfig.mergeApplicationDepartArr != null){
+					Ext.getCmp('autoMergeApplicationDepartsCodes').setValue(supplyRoomConfig.mergeApplicationDepartArr);
+					var autoMergeApplicationDepartsShowArr = [];
+					var autoMergeApplicationDepartsJsonArray = Ext.decode(supplyRoomConfig.mergeApplicationDepartArr);
+					for ( var j = 0; j < autoMergeApplicationDepartsJsonArray.length; j++) {
+						var record = autoMergeApplicationDepartsJsonArray[j];
+						autoMergeApplicationDepartsShowArr.push(record['mergeApplicationDepartsName']);
+					}
+					Ext.getCmp('autoMergeApplicationDepartsName').setValue(autoMergeApplicationDepartsShowArr.join(";"));
+				}
 			}else{
 				Ext.getCmp('autoMergeApplication').setValue('否');
 				Ext.getCmp('isORAppFormMergeLabel').hide();
 				Ext.getCmp('noMergeApplicationTypesLabel').hide();
+				Ext.getCmp('autoMergeApplicationDeparts').hide();//自动合并申请单的科室
 			}
+			
 			if(supplyRoomConfig.isORAppFormMerge){
 				Ext.getCmp('isORAppFormMerge').setValue('是');
 			}else if(supplyRoomConfig.isORAppFormMerge == undefined){