Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r36119 -r36123
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 36119)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 36123)
@@ -561,14 +561,18 @@
 });
 
 //时间转换
-function getNewDate(time,status,sterilisationUseTime){
+function getNewDate(time,status,sterilisationUseOrCleanMinutesTime){
 	var timeString = new Date(time).getTime();
-	if(status == '已审核'){
+	if(status == '清洗消毒'){
+		timeString = timeString + 10*60*1000;
+	}else if(status == '已装配'){
+		timeString = timeString + (10+sterilisationUseOrCleanMinutesTime)*60*1000;
+	}else if(status == '已审核'){
 		timeString = timeString + 5*60*1000;
 	}else if(status == '灭菌中'){
 		timeString = timeString + 30*60*1000;
 	}else if(status == '已灭菌'){
-		timeString = timeString + (sterilisationUseTime || 0)*60*1000;
+		timeString = timeString + (sterilisationUseOrCleanMinutesTime || 0)*60*1000;
 	}else if(status == '已发货'){
 		timeString = timeString + 5*60*1000;
 	}else if(status == '配送中'){
@@ -579,10 +583,10 @@
 	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();
+	var D = (newDate.getDate() < 10 ? '0'+(newDate.getDate()) : newDate.getDate()) + ' ';
+	var h = (newDate.getHours() < 10 ? '0'+(newDate.getHours()) : newDate.getHours()) + ':';
+	var m = (newDate.getMinutes() < 10 ? '0'+(newDate.getMinutes()) : newDate.getMinutes()) + ':';
+	var s = (newDate.getSeconds() < 10 ? '0'+(newDate.getSeconds()) : newDate.getSeconds());
 	return Y+M+D+h+m+s;
 }
 
@@ -809,14 +813,33 @@
 							var cleanMinutes = result.cleanMinutes || 0;
 							var sterilisationUseTime = result.sterilisationUseTime || 0;
 							var status = fixedProgressStatus[index];
-							if(status == '已装配'){
+							if(status == '回收清点'){
+								washStartTime = getNewDate(recyclingTime,'清洗消毒');
+								operationTime = getNewDate(washStartTime,'已装配',cleanMinutes);
 								reviewTime = getNewDate(operationTime,'已审核');
 								sterileStartTime = getNewDate(reviewTime,'灭菌中');
 								sterileEndTime = getNewDate(sterileStartTime,'已灭菌',sterilisationUseTime);
 								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
 								printTime = getNewDate(invoiceSendTime,'配送中');
 								signedDate = getNewDate(printTime,'已签收');
 								useRecordEnteringDate = '';
+							}else if(status == '清洗消毒'){
+								operationTime = getNewDate(washStartTime,'已装配',cleanMinutes);
+								reviewTime = getNewDate(operationTime,'已审核');
+								sterileStartTime = getNewDate(reviewTime,'灭菌中');
+								sterileEndTime = getNewDate(sterileStartTime,'已灭菌',sterilisationUseTime);
+								invoiceSendTime = getNewDate(sterileEndTime,'已发货');
+								printTime = getNewDate(invoiceSendTime,'配送中');
+								signedDate = getNewDate(printTime,'已签收');
+								useRecordEnteringDate = '';
+							}else 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);