Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
===================================================================
diff -u -r17003 -r21395
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 17003)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 21395)
@@ -115,16 +115,15 @@
 	}
 	speaker.speak(msg);
 }
-function displayTousseInstanceInfo(tousseInstance){
-	
+function displayTousseInstanceInfo(tousseInstance,signType,barcode){
 	var status = tousseInstance.status;
     var tousseName = tousseInstance.tousseName;
 	if(tousseName == null || tousseName.length == 0){
         $('#tousseName').html(' ');
     }else{
-        $('#tousseName').html(tousseName);
+        $('#tousseName').html("包实例条码"==signType?tousseName:signType);
     }
-	var barcode = tousseInstance.tousseBarcode;
+	var barcode = tousseInstance.tousseBarcode==barcode?tousseInstance.tousseBarcode:barcode;
     if(barcode == null || barcode.length == 0){
         $('#tousseBarcode').html(' ');
     }else{
@@ -269,19 +268,21 @@
            dataType:'json',
            success:function(data){
 	          if(data.success){
-	              var tousseInstance = data.instance;
-	              if (tousseInstance != null && tousseInstance != ""){
-	                  displayTousseInstanceInfo(tousseInstance);
-	                  if(!sstsConfig.donotSpeakTousseSignSuccessMessage){
-	                	  speakSignedTousse(tousseInstance);
-	                  }
+	              var jsonArr = data.arr
+	              if(jsonArr.length>0){
+	                  for(var i=0;i<jsonArr.length;i++){
+	                      //将包实例显示在页面上
+	                      displayTousseInstanceInfo(jsonArr[i],data.signType,data.barcode);
+	                      if(!sstsConfig.donotSpeakTousseSignSuccessMessage){
+	                          speakSignedTousse(jsonArr[i]);
+	                      }
+	                  }  
 	              }else{
-	               	  clearInfo();
+	                  clearInfo();
 	              }
 	              loadTodaySignedTousse();
 	          }else{
 	        	  speaker.speak(data.msg);
-	        	  //alert(data.msg);
 	        	  alertDiv(data.msg);
 	          }
            },
@@ -376,7 +377,7 @@
 				<table id="awaitForRecycleTable" width="940" border="0"
 					cellspacing="0" cellpadding="0"  >
 					<tr>
-						<td colspan="2" width="640"><label id="tousseName">&nbsp;</label></td>
+						<td colspan="2" width="640"><label id="tousseName"></label></td>
 						<td colspan="2" width="300"><label id="tousseBarcode">&nbsp;</label></td>
 					</tr>
 					<tr>
@@ -389,12 +390,12 @@
 						<td><label>审核时间:</label><label id="reviewTime">&nbsp; </label></td>
 					</tr>
 					<tr>
-                        <td><label>签收人:</label><label id="signedUser"> &nbsp;</label></td>
-                        <td><label>签收时间:</label><label id="signedDate">&nbsp; </label></td>
+					<td><label>灭菌人:</label><label id="sterialer"> &nbsp;</label></td>
+                        <td><label>灭菌时间:</label><label id="sterialTime"> &nbsp;</label></td>
                     </tr>
 					<tr>
-						<td><label>灭菌人:</label><label id="sterialer"> &nbsp;</label></td>
-						<td><label>灭菌时间:</label><label id="sterialTime"> &nbsp;</label></td>
+						<td><label>签收人:</label><label id="signedUser"> &nbsp;</label></td>
+                        <td><label>签收时间:</label><label id="signedDate">&nbsp; </label></td>
 						<td><label>失效日期:</label></td>
                         <td><label id="invalidateTime"> &nbsp;</label></td>
 					</tr>