Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r32786 -r32954
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32786)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32954)
@@ -523,6 +523,7 @@
 	var useRecordOperator = '';
 	var useRecordEnteringDate = '';
 	var isPrint = '';
+	var tousseInstanceId = '';
 	for(var i=0;i<progressLength;i++){
 		documentGetElementsByClassName('s-step')[i].className = 's-step s-step'+i;
 		documentGetElementsByClassName('green'+i)[0].style.display = 'block';
@@ -555,6 +556,7 @@
 		useRecordOperator = items[i].get('useRecordOperator');
 		useRecordEnteringDate = items[i].get('useRecordEnteringDate');
 		isPrint = items[i].get('isPrint');
+		tousseInstanceId = items[i].get('id');
 	}
 	var arr = ['科室申领','已回收','清洗消毒','已装配/已消毒','已审核','灭菌中/灭菌待确认','已灭菌','已发货','配送中','已签收','已使用'];
 	var titleArr = progressStatusTitle;
@@ -806,6 +808,20 @@
 		}
 		$('.x-toolbar').css('background','url('+WWWROOT+'/ext/fontSize12/resources/images/default/toolbar/bg2.gif) left top repeat-x rgb(208, 222, 240)');
 	}
+	if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule && isSterile == '是' && (status == '已装配' || status == '已审核' || status == '灭菌中')){
+		Ext.Ajax.request({
+			url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!displayEstimatedSterilizationCompletionTime.do',
+			params : {tousseInstanceId : tousseInstanceId},
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				if(result.success){
+					document.getElementById('msgLabel').innerHTML = result.message;
+					document.getElementById('msgLabel').style.display = 'block';
+				}
+			},
+			failure : function(response, options) {}
+		});
+	}
 
 }
 
@@ -876,6 +892,7 @@
 		}
 		html += '</span>';
 	}
+	html += '<span id="msgLabel" style="height: 40px;line-height: 40px;color: red;display:none"></span>';
 	html += '</div>';
 	if(window.screen.width < 1366){
 		document.getElementById('progressBars_2').innerHTML = html;
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r32942 -r32954
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 32942)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 32954)
@@ -939,7 +939,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							items: [{
 								xtype: 'numberfield',
@@ -951,7 +951,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 180 : 220,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							labelAlign: "right",
 							columnWidth: .25,
 							items: [{
@@ -1006,7 +1006,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							id: 'isTousseDgMergeConvertLabel',
 							items: [{
@@ -1029,7 +1029,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							items: [{
 								xtype: 'numberfield',
@@ -1043,7 +1043,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							id: 'supplierCertificationExpTimeLabel',
 							items: [{
@@ -1058,7 +1058,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							id: 'expensiveGoodsBillWarningTimeLabel',
 							items: [{
@@ -1103,7 +1103,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
+							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
 							id: 'expensiveGoodsPaperTypeLabel',
 							items: [{
@@ -1121,6 +1121,34 @@
 								triggerAction: 'all',
 								anchor: '100%'
 							}]
+						}, {
+							layout: 'form',
+							labelWidth: 310,
+							columnWidth: .25,
+							hidden: !sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule,
+							items: [{
+								xtype: 'numberfield',
+								fieldLabel: '【已装配】到【已审核】预计用时（分钟）',
+								id: 'packingReviewTime',
+								name: 'packingReviewTime',
+								allowNegative: false,
+								allowBlank: true,
+								anchor: '100%'
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 310,
+							columnWidth: .25,
+							hidden: !sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule,
+							items: [{
+								xtype: 'numberfield',
+								fieldLabel: '【已审核】到【开始灭菌】预计用时（分钟）',
+								id: 'reviewSterilizationTime',
+								name: 'reviewSterilizationTime',
+								allowNegative: false,
+								allowBlank: true,
+								anchor: '100%'
+							}]
 						}
 					]
 				}, {
@@ -3130,6 +3158,9 @@
 						mergeApplicationDepartNameAndCodeArr = Ext.getCmp("autoMergeApplicationDepartsCodes").getValue();
 					}
 
+					var packingReviewTime = Ext.getCmp("packingReviewTime").getValue();
+					var reviewSterilizationTime = Ext.getCmp("reviewSterilizationTime").getValue();
+
 					var ftDefaultPackageType = Ext.getCmp("ftDefaultPackageType").getValue();
 					var isORAppFormMerge = Ext.getCmp("isORAppFormMerge").getValue();
 					var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
@@ -3182,6 +3213,8 @@
 							// customTousseNeedRecycle : customTousseNeedRecycle,//自定义器械包是否回收
 							customToussePrice: customToussePrice,//
 							dayStartTime: dayStartTime,//
+							packingReviewTime: packingReviewTime,
+							reviewSterilizationTime: reviewSterilizationTime,
 							disposableGoodsWarningDate: disposableGoodsWarningDate,
 							disposableGoodsExpTime: disposableGoodsExpTime,//
 							fTHandleDepartAndTaskGroup: fTHandleDepartAndTaskGroup,
@@ -3480,6 +3513,13 @@
 				Ext.getCmp('urgentLevelName').setValue(supplyRoomConfig.urgentLevel.name);
 				Ext.getCmp('urgentLevelId').setValue(supplyRoomConfig.urgentLevel.id);
 			}
+			//GYEY-759:【已装配】到【已审核】预计用时（分钟）和【已审核】到【开始灭菌】预计用时（分钟）
+			if(supplyRoomConfig.packingReviewTime){
+				Ext.getCmp('packingReviewTime').setValue(supplyRoomConfig.packingReviewTime);
+			}
+			if(supplyRoomConfig.reviewSterilizationTime){
+				Ext.getCmp('reviewSterilizationTime').setValue(supplyRoomConfig.reviewSterilizationTime);
+			}
 
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
===================================================================
diff -u -r32919 -r32954
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 32919)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 32954)
@@ -113,6 +113,11 @@
   enableUrgentFunction:true,
   //开启不良事件管理
   enableAdverseEventManagement:true,
+  closeFormDefinition:false,
   //回收超时需排除之外的时间 不支持超过24小时
-  recyclingTimeoutNeedsToExcludeTheTime:["18:00","08:00"]
+  recyclingTimeoutNeedsToExcludeTheTime:["18:00","08:00"],
+  //启用器械包状态进度条
+  enableTousseStatusProgressBar:true,
+  //在器械包信息模块显示预计灭菌完成时间
+  displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule:true
 }
\ No newline at end of file