Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
===================================================================
diff -u -r25250 -r25308
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 25250)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 25308)
@@ -3,13 +3,12 @@
 
 var rd = new Ext.data.JsonReader( {
 	fields : [
-	    {name : 'id'},
-	    {name : 'departId'},
-	    {name : 'name'}
-	   
+		{name : 'id'},
+		{name : 'departId'},
+		{name : 'name'}
 	]
 });
-
+//20190103
 // 申请科室Store
 var sendDepartJsonStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -25,6 +24,21 @@
 	)
 });
 
+//20190103 
+//灭菌炉分组
+var sterilizerNameGroupJsonStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do?optionId=sterilerGroup',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		root : 'data',
+	},[
+			{name : 'sterilizerNameGroup', mapping : 'value'}
+		]
+	)
+});
+
 var supplyRoomStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
@@ -113,11 +127,14 @@
 		var startDate = $Id('startDate').value;
 		var endDate = $Id('endDate').value;
 		var sterilizerName = Ext.getCmp('sterilizerName').getValue();
+		var sterilizerNameGroup = Ext.getCmp('sterilizerNameGroup').getValue();
+		if(sterilizerNameGroup!=""){
+			sterilizerName = Ext.getCmp('sterilizerNameGroupValue').getValue();
+		}
 		var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue();
 		if(querySupplyRoom.indexOf(ALL) == 0){
 			querySupplyRoom = "";
 		}
-		
 		var sendDepart = Ext.getCmp('sendDepart').getRawValue();
 		var frequency = Ext.getCmp('frequency').getValue();
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225
@@ -235,7 +252,7 @@
 			height : 140,
 			items : [{
 				layout : 'column',
-				height : 60,
+				height : 100,//60,
 				labelWidth : 70,
 				items : [{
 					columnWidth : .2,
@@ -377,9 +394,9 @@
 						allowBlank : true
 					}]
 				},{
-					columnWidth : .4,
+					columnWidth : .411,
 					layout : 'form',
-					labelWidth : 50,
+					labelWidth : 60,
 					items : [{
 						xtype : 'combo',
 						fieldLabel : "灭菌炉",
@@ -394,6 +411,12 @@
 								}
 							}
 						}),
+						listeners: {
+							select:function(combo, record, index){
+								var ab =record.get("sterilizerName");
+								Ext.getCmp('sterilizerNameGroup').setValue("");
+							}
+						},
 						triggerAction : 'all',
 						forceSelection : false,
 						lazyInit : false,
@@ -406,8 +429,61 @@
 						anchor : '95%'
 					}]
 				},{
+						fieldLabel : '灭菌炉分组的值',
+						id : 'sterilizerNameGroupValue',
+						name : 'sterilizerNameGroupValue',
+						xtype : 'hidden',
+						anchor : '99%'
+        },{
+					columnWidth : .25,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : "灭菌炉分组",
+						valueField : 'sterilizerNameGroup',
+						displayField : 'sterilizerNameGroup',
+						listeners: {
+							select:function(combo, record, index){
+								Ext.getCmp('sterilizerName').setValue("");
+								var sname = record.data.sterilizerNameGroup;
+								//ajax获取数据
+								Ext.Ajax.request({
+									url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do',
+									method:'post',
+									//async:false,
+									params:{
+										ownGroup:sname,
+										needFilter:true
+										},
+									success:function(response,options){
+										var str='';
+										var sterilizerNameGroup = response.responseText;
+										for(var i=0;i<sterilizerNameGroup.length;i++){
+											if(sterilizerNameGroup[i]!="["&&sterilizerNameGroup[i]!="]"&&sterilizerNameGroup[i]!="'"){
+												str += sterilizerNameGroup[i];
+											}
+										}
+										Ext.getCmp('sterilizerNameGroupValue').setValue(str);
+									}
+								})
+							}
+						},
+						triggerAction : 'all',
+						forceSelection : false,
+						lazyInit : false,
+						editable : false,
+						hideTrigger : false,
+						typeAhead : false,
+						allowBlank : true,
+						name : "sterilizerNameGroup",
+						id : "sterilizerNameGroup",
+						anchor : '95%',
+						store : sterilizerNameGroupJsonStore,					
+					}]
+				},{
 					layout:'form',
-					columnWidth:.22,
+					columnWidth:.199,
 					labelWidth:60,
 					items:[{
 						xtype : 'textfield',