Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r16469 -r17111
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 16469)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 17111)
@@ -164,15 +164,17 @@
 .clds-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
 .clds-box .send table{ width:50%; margin:0 auto}
 
-.image-box{ width:290px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:0px 0px}
+.image-box{ width:536px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:0px 0px}
 .image-box .table{ border:1px solid #ddd; padding:1px}
-.image-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:20px;}
+.image-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:17px;}
 .image-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:40px;}
 .image-box .box{height:393px; overflow-y:scroll; background:#fff; overflow-x:hidden}
-.image-box .box table{ margin:0 auto; width:290px}
+.image-box .box table{ margin:0 auto; width:536px}
 .image-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:13px; color:#2e6271; padding:8px 0}
-.image-box .box .w7{font-size:18px; width:20px}
-.image-box .box .w8{font-size:18px; width:20px}
+.image-box .box .w7{font-size:17px;}
+.image-box .box .w8{font-size:17px;}
+.image-box .box .w9{font-size:17px;}
+.image-box .box .w10{font-size:17px;}
 
 .remark-box{ margin:0 auto; font-size:13px; background:#f0f0f0; padding:0px 0px}
 .remark-box .table{ border:1px solid #ddd; padding:1px}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r16906 -r17111
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 16906)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 17111)
@@ -182,6 +182,9 @@
 						.getMaterialInstances();
 				for (MaterialInstance mi : list) {
 					MaterialDefinition md = mi.getMaterialDefinition();
+					if(md == null){
+						continue;
+					}
 					String materialName = md.getName();
 					String specification = md.getSpecification();
 					if (StringUtils.isNotBlank(specification)) {
@@ -203,6 +206,8 @@
 					obj.put("washClassifyType",
 							md.getWashClassifyType() == null ? "" : md
 									.getWashClassifyType());
+					obj.put("washQualityCheckPoint", md.getWashQualityCheckPoint());
+					obj.put("functionCheck", md.getFunctionCheck());
 					array.add(obj);
 				}
 			}
Index: ssts-web/src/main/webapp/js/magnificPopup/magnific-popup.css
===================================================================
diff -u -r12331 -r17111
--- ssts-web/src/main/webapp/js/magnificPopup/magnific-popup.css	(.../magnific-popup.css)	(revision 12331)
+++ ssts-web/src/main/webapp/js/magnificPopup/magnific-popup.css	(.../magnific-popup.css)	(revision 17111)
@@ -235,11 +235,11 @@
 .mfp-iframe-holder .mfp-content {
   line-height: 0;
   width: 100%;
-  max-width: 900px; }
+  max-width: 1110px; }
 
 .mfp-iframe-scaler {
   width: 100%;
-  height: 0;
+  height: 0px;
   overflow: hidden;
   padding-top: 56.25%; }
 
@@ -249,7 +249,7 @@
   top: 0;
   left: 0;
   width: 100%;
-  height: 100%;
+  height: 80%;
   box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
   background: black; }
 
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r14059 -r17111
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 14059)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 17111)
@@ -37,8 +37,12 @@
          for (var i=0; i<json.length; i++) {
              var materialName = json[i].materialName;
              var materialAmount = json[i].amount;
-             trData += '<tr onclick=\"onMaterialItemClick(\''+materialName+'\',this);\"><td class="w7" style="width:143px;height:18px;" align="center">'+materialName+'</td>'
-             +'<td class="w8" style="width:147px;height:18px;" align="center">'+materialAmount+'</td></tr>';
+             trData += '<tr onclick=\"onMaterialItemClick(\''+materialName+'\',this);\">';
+             trData += '<td class="w7" style="width:157px;height:40px;" align="center">'+materialName+'</td>';
+             trData += '<td class="w8" style="width:62px;height:40px;" align="center">'+materialAmount+'</td>';
+             trData += '<td class="w9" style="width:152px;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
+             trData += '<td class="w10" style="width:153px;height:40px;" align="center">'+json[i].functionCheck+'</td>';
+             trData += '</tr>';
          }
          document.getElementById("myTable").innerHTML = "<table id='materialTable' border='0' cellspacing='0' cellpadding='0'>" + trData + "</table>";
     });
@@ -170,8 +174,10 @@
                 <div id="MaterialID" class="table">
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr class="title">
-                                <th width="50%">材料名称</th>
-                                <th width="50%">材料数量</th>
+                                <th width="30%">材料名称</th>
+                                <th width="12%">数量</th>
+                                <th width="29%">清洗质量检查关注点</th>
+                                <th width="29%">功能检查</th>
                             </tr>
                         </table>
                         <div class="box" id="materialDIV">