Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r16360 -r16511
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 16360)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 16511)
@@ -90,6 +90,45 @@
 	}
 }
 
+//返回炉次显示框
+function createQualityMonitoringElementSterName(value){
+	return {
+		columnWidth : .5,
+		layout : 'form',
+		labelWidth : 90,
+		items : [{
+			xtype : 'textfield',
+			fieldLabel : '炉次',
+			maxLength : '30',
+			id : 'configItemOptionSterName',
+			name : 'configItemOptionSterName',
+			allowBlank : true,
+			readOnly : true,
+			value : value,
+			anchor : '95%'
+		}]
+	};
+}
+// 返回炉号显示框
+function createQualityMonitoringElementSterFre(value){
+	return {
+		columnWidth : .5,
+		layout : 'form',
+		labelWidth : 90,
+		items : [{
+			xtype : 'textfield',
+			fieldLabel : '炉号',
+			maxLength : '30',
+			id : 'configItemOptionSterFre',
+			name : 'configItemOptionSterFre',
+			allowBlank : true,
+			readOnly: true,
+			value : value,
+			anchor : '95%'
+		}]
+	};
+}
+
 function createQualityMonitoringItemElement(type,id,name,allowBlank,options,value,isTriggerItem){
 	var hideElement = false;
 	if('是' == isTriggerItem && (value == null || value == "")){
@@ -943,6 +982,11 @@
 			if(result.success){
 				top.Ext.getCmp('optionAmount').setValue('');
 				var items = new Array();
+				// 如果显示炉次炉号，添加表单
+				if(result.data.showSterilizerNumFrequency == '是'){
+					items.push(createQualityMonitoringElementSterName(''));
+					items.push(createQualityMonitoringElementSterFre(''));
+				}
 				//需要增加判空处理防止js报错
 				if(result.data){
 					top.Ext.getCmp('scope').setValue(result.data.scope);
@@ -1453,6 +1497,11 @@
 					top.Ext.getCmp('remark').setValue(result.data.remark);
 					top.Ext.getCmp('optionAmount').setValue('');
 					var items = new Array();
+					// 如果显示炉次炉号，添加表单
+					if(result.showSterNameAndFre == '是'){
+						items.push(createQualityMonitoringElementSterName(result.data.sterilizerName));
+						items.push(createQualityMonitoringElementSterFre(result.data.sterilizerFrequency));
+					}
 					for(var i = 0 ;i < result.data.items.length ;i++){
 						var item = result.data.items[i].definitionItem;
 						if(top.Ext.getCmp('optionAmount').getValue() == null || top.Ext.getCmp('optionAmount').getValue() == ''){
@@ -1665,6 +1714,11 @@
 						top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId);
 						top.Ext.getCmp('tousseType').setValue(result.tousseType);
 						top.Ext.getCmp('tousseDefRecycling').setValue(result.isRecycle);
+						if( !isUndefinedOrNullOrEmpty(top.Ext.getCmp('configItemOptionSterName')) ){
+							// 显示炉次和炉号
+							top.Ext.getCmp('configItemOptionSterName').setValue(result.sterilizerName);
+							top.Ext.getCmp('configItemOptionSterFre').setValue(result.sterileFrequency);
+						}
 //						top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson);
 						if(result.tousseDefinitionId){
 							top.Ext.getCmp('tousseDefinitionId').setValue(result.tousseDefinitionId);