Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r31913 -r32096
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 31913)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32096)
@@ -9,8 +9,9 @@
 var fuzzyQuery = '模糊查询';
 var inspectorName = "检查人";
 var progressLength = 0;
-var progressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用'];
-var fixedProgressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用'];
+var progressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','配送中','已签收','已使用'];
+var progressStatusTitle = ['申请人,申请时间','回收人,回收时间','清洗人,清洗时间','装配人,装配时间','审核人,审核时间','灭菌员,灭菌开始时间','灭菌员,灭菌完成时间','发货人,发货时间','下送责任人,下送开始时间','签收人,签收时间','操作人,录入日期'];
+var fixedProgressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','配送中','已签收','已使用'];
 if(sstsConfig.aliasNameOfInspectorField){
 	inspectorName = sstsConfig.aliasNameOfInspectorField;
 }
@@ -500,8 +501,28 @@
 	var status = '';
 	var tousseType = '';
 	var isSterile = '';
+	var applicant = '';
 	var applicationTime = '';
+	var recyclingUser = '';
 	var recyclingTime = '';
+	var washOperator = '';
+	var washStartTime = '';
+	var operator = '';
+	var operationTime = '';
+	var reviewer = '';
+	var reviewTime = '';
+	var sterilizationUser = '';
+	var sterileStartTime = '';
+	var sterileEndTime = '';
+	var invoiceSender = '';
+	var invoiceSendTime = '';
+	var personInCharge = '';
+	var printTime = '';
+	var signedUser = '';
+	var signedDate = '';
+	var useRecordOperator = '';
+	var useRecordEnteringDate = '';
+	var isPrint = '';
 	for(var i=0;i<progressLength;i++){
 		documentGetElementsByClassName('s-step')[i].className = 's-step s-step'+i;
 		documentGetElementsByClassName('green'+i)[0].style.display = 'block';
@@ -512,10 +533,31 @@
 		status = items[i].get('status');
 		tousseType = items[i].get('tousseDefinition.tousseType');
 		isSterile = items[i].get('tousseDefinition.isSterile');
+		applicant = items[i].get('applicant');
 		applicationTime = items[i].get('applicationTime');
+		recyclingUser = items[i].get('recyclingUser');
 		recyclingTime = items[i].get('recyclingTime');
+		washOperator = items[i].get('washOperator');
+		washStartTime = items[i].get('washStartTime');
+		operator = items[i].get('operator');
+		operationTime = items[i].get('operationTime');
+		reviewer = items[i].get('reviewer');
+		reviewTime = items[i].get('reviewTime');
+		sterilizationUser = items[i].get('sterilizationUser');
+		sterileStartTime = items[i].get('sterileStartTime');
+		sterileEndTime = items[i].get('sterileEndTime');
+		invoiceSender = items[i].get('invoiceSender');
+		invoiceSendTime = items[i].get('invoiceSendTime');
+		personInCharge = items[i].get('personInCharge');
+		printTime = items[i].get('personInCharge');
+		signedUser = items[i].get('signedUser');
+		signedDate = items[i].get('signedDate');
+		useRecordOperator = items[i].get('useRecordOperator');
+		useRecordEnteringDate = items[i].get('useRecordEnteringDate');
+		isPrint = items[i].get('isPrint');
 	}
-	var arr = ['科室申领','已回收','清洗消毒','已装配/已消毒','已审核','灭菌中/灭菌待确认','已灭菌','已发货','已签收','已使用'];
+	var arr = ['科室申领','已回收','清洗消毒','已装配/已消毒','已审核','灭菌中/灭菌待确认','已灭菌','已发货','配送中','已签收','已使用'];
+	var titleArr = progressStatusTitle;
 	if(sstsConfig.tousseStatusProgressBarConfig){
 		var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes;
 		for(var i=0;i<hidingNodes.length;i++){
@@ -526,18 +568,69 @@
 		}
 	}
 	var index = -1;
-	for(var i=0;i<arr.length;i++){
-		if(arr[i].indexOf(status) >= 0){
-			index = i;
+	if(arr.indexOf(status) >= 0){
+		index = arr.indexOf(status);
+		if(status == '已发货' && isPrint == '是'){
+			index++;
 		}
 	}
-
+	if(items.length == 0){
+		for(var i=0;i<=index;i++){
+			documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+'';
+			documentGetElementsByClassName('green'+i)[0].style.display = 'block';
+			documentGetElementsByClassName('grey'+i)[0].style.display = 'none';
+			documentGetElementsByClassName('red'+i)[0].style.display = 'block';
+		}
+		return;	
+	}
+	for(var i=0;i<arr.length;i++){
+		var name = '';
+		var time = '';
+		documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';;
+	}
 	if(index > 0){
 		for(var i=0;i<=index;i++){
 			documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+' active';
 			documentGetElementsByClassName('green'+i)[0].style.display = 'none';
 			documentGetElementsByClassName('grey'+i)[0].style.display = 'none';
 			documentGetElementsByClassName('red'+i)[0].style.display = 'block';
+			var name = '';
+			var time = '';
+			if(titleArr[i].split(',')[0] == '申请人'){
+				name = applicant;
+				time = applicationTime;
+			}else if(titleArr[i].split(',')[0] == '回收人'){
+				name = recyclingUser;
+				time = recyclingTime;
+			}else if(titleArr[i].split(',')[0] == '清洗人'){
+				name = washOperator;
+				time = washStartTime;
+			}else if(titleArr[i].split(',')[0] == '装配人'){
+				name = operator;
+				time = operationTime;
+			}else if(titleArr[i].split(',')[0] == '审核人'){
+				name = reviewer;
+				time = reviewTime;
+			}else if(titleArr[i].split(',')[1] == '灭菌开始时间'){
+				name = sterilizationUser;
+				time = sterileStartTime;
+			}else if(titleArr[i].split(',')[1] == '灭菌完成时间'){
+				name = sterilizationUser;
+				time = sterileEndTime;
+			}else if(titleArr[i].split(',')[0] == '发货人'){
+				name = invoiceSender;
+				time = invoiceSendTime;
+			}else if(titleArr[i].split(',')[0] == '下送责任人'){
+				name = personInCharge;
+				time = printTime;
+			}else if(titleArr[i].split(',')[0] == '签收人'){
+				name = signedUser;
+				time = signedDate;
+			}else if(titleArr[i].split(',')[0] == '签收人'){
+				name = useRecordOperator;
+				time = useRecordEnteringDate;
+			}
+			documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';;
 		}
 	}
 
@@ -578,14 +671,18 @@
 		documentGetElementsByClassName('grey2')[0].style.display = 'block';
 		documentGetElementsByClassName('red2')[0].style.display = 'none';
 	}
+	if(arr.indexOf(status) >= 0 && status == '已签收' && isPrint !== '是'){
+		documentGetElementsByClassName('s-step'+(index-1))[0].className = 's-step s-step'+(index-1)+' none';
+	}
 }
 
 //获取进度条
-function getprogressStatus(arr){
+function getprogressStatus(arr,titleArr){
 	var html = '<div class="order_status">';
 	progressLength = arr.length;
 	for(var i=0;i<arr.length;i++){
-		html += '<span class="s-step s-step'+i+'">';
+		var title = '<p>'+titleArr[i].split(',')[0]+'：</p><p>'+titleArr[i].split(',')[1]+'：</p>';
+		html += '<span class="s-step s-step'+i+'" title="'+title+'">';
 		html += '<b>';
 		html += '<b class="green green'+i+'"></b>';
 		html += '<b class="red red'+i+'"></b>';
@@ -665,6 +762,8 @@
 		{header : "灭菌批号",width : 150,dataIndex : 'sterileFrequency',sortable: false,menuDisabled : true,renderer:nameAndFrequency},
 		{header : "发货人",width : 60,dataIndex : 'invoiceSender',sortable: false,menuDisabled : true},
 		{header : "发货时间",width : 125,dataIndex : 'invoiceSendTime',menuDisabled : false,renderer:myDateFormatBySecond,sortable: true},
+		{header : "下送责任人",width : 80,dataIndex : 'personInCharge',sortable: false,menuDisabled : true},
+		{header : "下送开始时间",width : 125,dataIndex : 'printTime',menuDisabled : false,renderer:myDateFormatBySecond,sortable: true},
 		{header : "签收人",width : 60,dataIndex : 'signedUser', hidden:!sstsConfig.showSignedItems, sortable: false,menuDisabled : true},
 		{header : "签收时间",width : 125,dataIndex : 'signedDate', hidden:!sstsConfig.showSignedItems, menuDisabled : false,renderer:myDateFormatBySecond,sortable: true},
 		{header : "使用病人",width : 60,dataIndex : 'patientName',hidden:!sstsConfig.showUseRecordItems,sortable: false},
@@ -723,6 +822,7 @@
 	    {name : 'wasteReason'},
 	    {name : 'operateUser'},
 	    {name : 'sterilizationUser'},
+		{name : 'sterileStartTime'},
 	    {name : 'sterilizationBasket'},
 	    {name : 'sterileEndTime'},
 	    {name : 'sterileFrequency'},
@@ -736,10 +836,18 @@
 	    {name : 'patientName'},
 	    {name : 'doctorName'},
 	    {name : 'useTime'},
+		{name : 'isPrint'},
+	    {name : 'personInCharge'},
+	    {name : 'printTime'},
+		{name : 'applicant'},
 	    {name : 'applicationTime'},
 	    {name : 'recyclingTime'},
 	    {name : 'invoicePlanSerialNum'},
 	    {name : 'invoiceserialNumber'},
+		{name : 'signedUser'},
+		{name : 'signedDate'},
+		{name : 'useRecordOperator'},
+		{name : 'useRecordEnteringDate'},
 		{name : 'inspector'}
 	];
 
@@ -1658,16 +1766,18 @@
 				}
 				if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){
 					var arr = progressStatus;
+					var titleArr = progressStatusTitle;
 					if(sstsConfig.tousseStatusProgressBarConfig){
 						var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes;
 						for(var i=0;i<hidingNodes.length;i++){
 							if(arr.indexOf(hidingNodes[i]) >= 0){
 								var index = arr.indexOf(hidingNodes[i]);
 								arr.splice(index,1);
+								titleArr.splice(index,1);
 							}
 						}
 					}
-					getprogressStatus(arr);
+					getprogressStatus(arr,titleArr);
 				}
 			}
 		}
@@ -1705,7 +1815,26 @@
 	});
 
 	Ext.onReady(function(){
-		
+		var x = 10;
+		var y = 20;
+		$(".s-step").mouseover(function (e) {
+			this.myTitle = this.title;
+			this.title = "";
+			var tooltip = "<div id='tooltip'>" + this.myTitle + "<\/div>"; //创建 div 元素 文字提示
+			$("body").append(tooltip);	//把它追加到文档中
+			$("#tooltip").css({
+				"top": (e.pageY + y) + "px",
+				"left": (e.pageX + x) + "px"
+			}).show("fast");	  //设置x坐标和y坐标，并且显示
+		}).mouseout(function () {
+			this.title = this.myTitle;
+			$("#tooltip").remove();   //移除 
+		}).mousemove(function (e) {
+			$("#tooltip").css({
+				"top": (e.pageY + y) + "px",
+				"left": (e.pageX + x) + "px"
+			});
+		});
 	})
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r31716 -r32096
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 31716)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 32096)
@@ -86,6 +86,7 @@
 	var GETINGE = '<%= DeviceInterface.GETINGE %>';
 	var GETING_86_SERIES = '<%= DeviceInterface.GETING_86_SERIES %>';
 </script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css?version=${svnRevision}"></link>
@@ -214,6 +215,15 @@
     .order_status .s-step p.border {
         border: 1px solid grey;
     }
+
+    #tooltip {
+        position: absolute;
+        border: 1px solid #333;
+        background: #f7f5d1;
+        padding: 1px;
+        color: #333;
+        display: none;
+    }
 </style>
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
@@ -395,6 +405,7 @@
     <input type="hidden" id="id_sterilizationBasket" name="sterilizationBasket">
     
     <input type="hidden" id="id_treatmentNum" name="treatmentNum">
+    <input type="hidden" id="id_isDisableIDCard" name="isDisableIDCard">
     <input type="hidden" id="id_hospitalNum" name="hospitalNum">
     <input type="hidden" id="id_patientName" name="patientName">
 </form>