Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r20086 -r20857
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 20086)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 20857)
@@ -5,6 +5,8 @@
 var supplyRoomStoreUseRecordToApplicationNotInvoice;
 var supplyRoomStoreTousseOperation;
 var supplyRoomStoreRecyclingApplicationNotInvoice;
+//高值耗材处理科室的store
+var supplyRoomStoreExpensiveGoods;
 var sterilingTypeStore;
 var packageTypeStore;
 var configWinHeight = top.screen.height > 1000 ? 700 : 600;
@@ -298,6 +300,17 @@
 		}),
 		reader : rd
 	});
+	
+	//高值耗材处理科室的store
+	supplyRoomStoreExpensiveGoods = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
+			method : 'POST'
+		}),
+		baseParams :{type:"8"},
+		reader : rd
+	});
+	
 	//一级供应室配置的表格列头
 	var cmFirstSupplyRoom = new Ext.grid.ColumnModel( [ {
 		id : 'id',
@@ -484,6 +497,8 @@
 		$Id('supplyRoom_type_tousse_operation').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreTousseOperation);
 		//回收申请单不发货科室
 		$Id('supplyRoom_type_recycling_application_not_invoice').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreRecyclingApplicationNotInvoice);
+		//回收申请单不发货科室
+		$Id('supplyRoom_type_ExpensiveGoods').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreExpensiveGoods);
 	}
 	
 	var taskGroupJsonStore = new Ext.data.SimpleStore({
@@ -558,6 +573,10 @@
                 	name :'supplyRoom_type_recycling_application_not_invoice'
                 },{
                 	xtype:'hidden',
+                	id :'supplyRoom_type_ExpensiveGoods',
+                	name :'supplyRoom_type_ExpensiveGoods'
+                },{
+                	xtype:'hidden',
                 	id :'dptCodeOfForeignTousse',
                 	name :'dptCodeOfForeignTousse'
                 },{
@@ -2127,6 +2146,89 @@
 	if(sstsConfig.enableRecyclingApplicationNotInvoice){
 		tabsItemArr.push(recyclingApplicationNotInvoiceConfigTab);
 	}
+	
+	if (sstsConfig.enableExpensiveGoods) {
+		tabsItemArr.push({
+	    	title: '<strong>高值耗材处理科室配置</strong>',
+	    	layout:'fit',
+	    	items:[
+	    		 new Ext.grid.EditorGridPanel({
+						id : 'expensiveGoodsSupplyRoom',
+						store : supplyRoomStoreExpensiveGoods,
+						cm : new Ext.grid.ColumnModel([{
+							dataIndex : 'id',
+							hidden :true
+						},{
+							dataIndex : 'departId',
+		                    header : '科室编码',
+		                    width : 20,
+							hidden :false
+						},{
+							header : "科室名称",
+							dataIndex : 'name',
+							width : 220,
+							menuDisabled : true
+						},{
+		                    header : "科室拼音",
+		                    dataIndex : 'spell',
+		                    width : 30,
+		                    hidden :true,
+		                    menuDisabled : true
+		                },{
+							id : 'deleteItem',
+							header:'删除',
+							width : 100,
+							renderer: function(v,p,record){
+								var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('expensiveGoodsSupplyRoom') \">";
+								return str;
+							},
+							menuDisabled : true,
+							dataIndex:'id'
+						}]),
+						width:document.body.offsetWidth-20,
+						height:document.body.offsetHeight-94,
+						frame : false,
+						viewConfig: {
+				            forceFit:true
+						},
+						bodyStyle : 'border:1px solid #9cbaef',
+						selModel : new Ext.grid.RowSelectionModel({
+							singleSelect : false
+						}),
+						autoExpandColumn : 'deleteItem',
+						tbar : [{
+							text : '选择科室  :'
+						},{
+							xtype : 'combo',
+							id : 'departNameExpensiveGoodsSupplyRoom',
+							name : 'departNameExpensiveGoodsSupplyRoom',
+							queryParam : 'spell',
+							minChars : 0,
+							valueField : 'id',
+							displayField : 'name',
+//							width : 320,
+							store : departJsonStore,
+							forceSelection : true,
+							lazyInit : true,
+							triggerAction : 'all',
+							hideTrigger : true,
+							typeAhead : false,
+							allowBlank : true,
+							anchor : '97%'
+						},{
+							text : '添加',
+							iconCls : 'btn_ext_add',
+							handler : function() {
+							    var name =Ext.getCmp('departNameExpensiveGoodsSupplyRoom').getRawValue(); 
+							    var departId =Ext.getCmp('departNameExpensiveGoodsSupplyRoom').getValue();
+							    addGridItem(supplyRoomStoreExpensiveGoods,name,departId,"departNameExpensiveGoodsSupplyRoom");
+							}
+						}]
+					})
+	    	]
+		});
+	}
+	
 	var tabs = new Ext.TabPanel({
 		activeTab: 0,
         width:document.body.offsetWidth-10,
@@ -2305,6 +2407,7 @@
         	  		var supplyRoom_type_userecord_to_application_not_invoice = Ext.getCmp('supplyRoom_type_userecord_to_application_not_invoice').getValue();
         	  		var supplyRoom_type_tousse_operation = Ext.getCmp('supplyRoom_type_tousse_operation').getValue();
         	  		var supplyRoom_type_recycling_application_not_invoice = Ext.getCmp('supplyRoom_type_recycling_application_not_invoice').getValue();
+        	  		var supplyRoom_type_ExpensiveGoods = Ext.getCmp('supplyRoom_type_ExpensiveGoods').getValue();
         	  		Ext.Ajax.request({
         	  			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!saveSupplyRoomCongfig.do',
         	  			method:'POST',
@@ -2316,6 +2419,7 @@
 	                    	supplyRoom_type_userecord_to_application_not_invoice : supplyRoom_type_userecord_to_application_not_invoice,
 	                    	supplyRoom_type_tousse_operation : supplyRoom_type_tousse_operation,
 	                    	supplyRoom_type_recycling_application_not_invoice:supplyRoom_type_recycling_application_not_invoice,
+	                    	supplyRoom_type_ExpensiveGoods: supplyRoom_type_ExpensiveGoods,  //高值耗材的grid数据
 	                    	saveImageMethod : saveImageMethod,//
 	                    	saveImagePath : saveImagePath,//
 	                    	secondWashCountWorkload : secondWashCountWorkload,//
@@ -2361,6 +2465,7 @@
 	                    	if(result.success){
 	                    		supplyRoomStoreFirstSupplyRoom.reload();
 	        		  			supplyRoomStoreSecondSupplyRoom.reload();
+	        		  			supplyRoomStoreExpensiveGoods.reload();
 	        					showResult('保存成功');
 	                    	}else{
 	                    		showResult(result.message);
@@ -2604,4 +2709,10 @@
   			hideMask(count,myMask);
   	    }  
   	});
+	supplyRoomStoreExpensiveGoods.load({  
+		callback: function(records, options, success){  
+			count++;
+			hideMask(count,myMask);
+		}  
+	});
 });
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r20840 -r20857
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 20840)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 20857)
@@ -67,6 +67,11 @@
 	
 	private String supplyRoom_type_recycling_application_not_invoice;
 	
+	/**
+	 * 高值耗材的grid数据
+	 */
+	private String supplyRoom_type_ExpensiveGoods;
+	
 	private String saveImageMethod;
 
 	private String saveImagePath;
@@ -647,6 +652,8 @@
 		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_TOUSSE_OPERATION, supplyRoom_type_tousse_operation, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
 		//回收申请单不发货科室
 		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_RECYCLING_APPLICATION_NOT_INVOICE, supplyRoom_type_recycling_application_not_invoice, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
+		//高值耗材处理科室
+		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY, supplyRoom_type_ExpensiveGoods, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
 		
 		// 保存新的SupplyRoomCongfig
 		if(!supplyRoomConfigToSave.isEmpty()){
@@ -1225,6 +1232,11 @@
 			if(CollectionUtils.isNotEmpty(secondSupplyRoomConfigList)){
 				supplyRoomConfigList.addAll(secondSupplyRoomConfigList);
 			}
+		}else if(StringUtils.equals(String.valueOf(SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY) , type)){
+			SupplyRoomConfig expensiveGoodsHandleDepartment = supplyRoomConfigManager.getExpensiveGoodsHandleDepartment();
+			if(expensiveGoodsHandleDepartment != null){
+				supplyRoomConfigList.add(expensiveGoodsHandleDepartment);
+			}
 		}else{//获取1级和2级供应室
 			SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
 			if(firstSupplyRoomConfig != null){
@@ -1577,6 +1589,15 @@
 		return barcodePaperType;
 	}
 
+	public String getSupplyRoom_type_ExpensiveGoods() {
+		return supplyRoom_type_ExpensiveGoods;
+	}
+
+	public void setSupplyRoom_type_ExpensiveGoods(
+			String supplyRoom_type_ExpensiveGoods) {
+		this.supplyRoom_type_ExpensiveGoods = supplyRoom_type_ExpensiveGoods;
+	}
+
 	public void setBarcodePaperType(String barcodePaperType) {
 		this.barcodePaperType = barcodePaperType;
 	}