Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27905 -r27918
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27905)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27918)
@@ -51,7 +51,8 @@
 	var piece = document.createElement('b');
 	piece.innerText = "件";
 	document.getElementById("materials").appendChild(piece);
-    var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"'}";
+	var showDisposableGoods = (parentPageName == '')?false:true;
+    var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"',showDisposableGoods:'"+showDisposableGoods+"'}";
     TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){
     	 var json = JSON.parse(result);
          var dataLength = 0;
@@ -88,8 +89,8 @@
 				trData += '<td onclick="onMaterialItemClick(\''+json[i].materialDefinitionId+'\',this);" class="w8" style="width:8.1%;height:40px;" align="center">'+materialAmount+'</td>';
 				trData += '<td onclick="onDetachableClick(\''+json[i].materialDefinitionId+'\',this);"  class="w8" style="width:8%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].detachable)+'</td>';
 				trData += '<td class="w8" style="width:10%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washMethod)+'</td>';
-				trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:16.6%;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
-				trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:14.1%;height:40px;" align="center">'+json[i].functionCheck+'</td>';
+				trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:16.6%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washQualityCheckPoint)+'</td>';
+				trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:14.1%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].functionCheck)+'</td>';
 				trData += '</tr>';
 			 }
          }
@@ -914,6 +915,9 @@
 	left: 0;
 	top: 0;
 }
+#materials b {
+	font-size: 20px;
+}
 </style>