Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r35299 -r36119
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 35299)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 36119)
@@ -559,6 +559,33 @@
 		readyFunction(serverTime);
 	});
 });
+
+//时间转换
+function getNewDate(time,status,sterilisationUseTime){
+	var timeString = new Date(time).getTime();
+	if(status == '已审核'){
+		timeString = timeString + 5*60*1000;
+	}else if(status == '灭菌中'){
+		timeString = timeString + 30*60*1000;
+	}else if(status == '已灭菌'){
+		timeString = timeString + (sterilisationUseTime || 0)*60*1000;
+	}else if(status == '已发货'){
+		timeString = timeString + 5*60*1000;
+	}else if(status == '配送中'){
+		timeString = timeString + 30*60*1000;
+	}else if(status == '已签收'){
+		timeString = timeString + 15*60*1000;
+	}
+	var newDate = new Date(timeString);
+	var Y = newDate.getFullYear() + '-';
+	var M = (newDate.getMonth()+1 < 10 ? '0'+(newDate.getMonth()+1) : newDate.getMonth()+1) + '-';
+	var D = newDate.getDate() + ' ';
+	var h = newDate.getHours() + ':';
+	var m = newDate.getMinutes() + ':';
+	var s = newDate.getSeconds();
+	return Y+M+D+h+m+s;
+}
+
 var isFirst = true;
 //更新进度条的状态
 function updateprogressStatus(items){
@@ -763,6 +790,98 @@
 				documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode;
 			}
 		}
+		//GYEY-805：增加预估时间
+		if(sstsConfig.enableTousseNodeProcessTimePrediction){
+			//灰色节点暂不处理
+			if(tousseType == '消毒物品' && isSterile == '否'){
+				
+			}else if(tousseType == '敷料包'){
+
+			}else if(applicationTime == '' && applicationTime == ''){
+
+			}else {
+				Ext.Ajax.request({
+					url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!loadTousseInstanceCleanMinuteSterilisationUseTime.do',
+					params : {id : tousseInstanceId},
+					success : function(response, options) {
+						var result = Ext.decode(response.responseText);
+						if(result.success){
+							var cleanMinutes = result.cleanMinutes || 0;
+							var sterilisationUseTime = result.sterilisationUseTime || 0;
+							var status = fixedProgressStatus[index];
+							if(status == '已装配'){
+								reviewTime = getNewDate(operationTime,'已审核');
+								sterileStartTime = getNewDate(reviewTime,'灭菌中');
+								sterileEndTime = getNewDate(sterileStartTime,'已灭菌',sterilisationUseTime);
+								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+								useRecordEnteringDate = '';
+							}else if(status == '已审核'){
+								sterileStartTime = getNewDate(reviewTime,'灭菌中');
+								sterileEndTime = getNewDate(sterileStartTime,'已灭菌',sterilisationUseTime);
+								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+							}else if(status == '灭菌中'){
+								sterileEndTime = getNewDate(sterileStartTime,'已灭菌',sterilisationUseTime);
+								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+							}else if(status == '已灭菌'){
+								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+							}else if(status == '已发货'){
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+							}else if(status == '配送中'){
+								signedDate = getNewDate(printTime,'已签收');
+							}
+							for(var i=index+1;i<fixedProgressStatus.length;i++){
+								var name = '预计';
+								var time = '';
+								var status = fixedProgressStatus[index];
+								if(titleArr[i].split(',')[0] == '申请人'){
+									time = applicationTime;
+								}else if(titleArr[i].split(',')[0] == '回收人'){
+									time = recyclingTime;
+								}else if(titleArr[i].split(',')[0] == '清洗人'){
+									time = washStartTime;
+								}else if(titleArr[i].split(',')[0] == '装配人'){
+									time = operationTime;
+								}else if(titleArr[i].split(',')[0] == '审核人'){
+									time = reviewTime;
+								}else if(titleArr[i].split(',')[1] == '灭菌开始时间'){
+									time = sterileStartTime;
+								}else if(titleArr[i].split(',')[1] == '灭菌完成时间'){
+									time = sterileEndTime;
+								}else if(titleArr[i].split(',')[0] == '发货人'){
+									time = invoiceSendTime;
+								}else if(titleArr[i].split(',')[0] == '下送责任人'){
+									time = printTime;
+								}else if(titleArr[i].split(',')[0] == '签收人'){
+									time = signedDate;
+								}else if(titleArr[i].split(',')[0] == '操作人'){
+									name = '';
+									time = useRecordEnteringDate;
+								}
+								if(sstsConfig.tousseStatusProgressBarConfig){
+									if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
+										documentGetElementsByClassName('name'+i)[0].innerHTML = name;
+										documentGetElementsByClassName('time'+i)[0].innerHTML = time;
+									}else {
+										documentGetElementsByClassName('s-step'+i)[0].title = '<p>预计时间：'+time+'</p>';
+									}
+								}else {
+									documentGetElementsByClassName('s-step'+i)[0].title = '<p>预计时间：'+time+'</p>';
+								}
+							}
+						}
+					}
+				});
+			}
+		}
 	}
 
 	var grey = '#555';
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
===================================================================
diff -u -r35217 -r36119
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 35217)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 36119)
@@ -161,6 +161,10 @@
    enableRFIDTousseIdCard:true,
    //启用一次性物品自定义批量发货功能
    enableCustomBatchInvoiceOfDisposableGoodsFunction:true,
+   //启用器械包闭环节点的时间预测功能
+   enableTousseNodeProcessTimePrediction:true,
+   //器械包状态进度条配置 -- hidingNodes：隐藏节点，showPersonAndDateTime：显示节点的处理人和处理时间，colorOfPassedNode：已经经过的节点的颜色，colorOfUnpassedNode：未经过的节点的颜色
+   tousseStatusProgressBarConfig:{ "showPersonAndDateTime" : true, "colorOfPassedNode" : "#f00000", "colorOfUnpassedNode" : "#367f21"},
    //启用数据实时看板功能
    enableRealTimeDashboardsForDataFunction:true
 }
\ No newline at end of file