Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r22273 -r24075
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 22273)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 24075)
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -10,7 +11,9 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-message.js"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
+<link rel="stylesheet" href="${ctx}/disinfectsystem/touchScreen/recycle/jShowResult.css"> 
 <script>
 var number = '${param.number}';
 var tousseName = '${param.tousseName}';
@@ -37,14 +40,17 @@
          for (var i=0; i<json.length; i++) {
              var materialName = json[i].materialName;
              var materialAmount = json[i].amount;
-             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>';
+             trData += '<td onclick="onMaterialItemClick(\''+materialName+'\',this);" class="w7" style="width:22.6%;height:40px;" align="center">'+materialName+'</td>';
+             trData += '<td onclick="onMaterialItemClick(\''+materialName+'\',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:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].detachable)+'</td>';
+             trData += '<td class="w8" style="width:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washMethod)+'</td>';
+             trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:29.6%;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
+             trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:15.1%;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>";
+         document.getElementById("myTable").innerHTML = "<table style='table-layout:fixed;' id='materialTable' border='0' cellspacing='0' cellpadding='0'>" + trData + "</table>";
     });
 }
 
@@ -60,16 +66,94 @@
  * 材料被点击时触发
  * @param mName 材料名称,包括规格
  */
-function onMaterialItemClick(mName,tr){
-	loadMaterialPic(mName,tr);
+function onMaterialItemClick(mName,td){
+	loadMaterialPic(mName,td);
 	loadMaterialNotice(mName);
 }
-//加载材料图片.mName:材料名称,tr:当前行对象
-function loadMaterialPic(mName , tr){
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date();
+//加载材料图片.mName:材料名称,td:当前点击的列
+function loadMaterialPic(mName , td){
+	currentType = '';
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date().getTime();
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
-	jQuery(tr).css("background" , "#eeeeee");
+	jQuery(td).parent().css("background" , "#eeeeee");
 }
+//加载是否可拆图片.materialDefinitionId:材料定义的id,td:当前点击的列
+function onDetachableClick(materialDefinitionId , td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onWashQualityCheckPointClick(materialDefinitionId , td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onFunctionCheckClick(materialDefinitionId, td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onOperationGuideClick(){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_TOUSSE_WASHGUIDE%>';
+	loadImage(tousseDefinitionID,imageType);
+}
+var currentType = '';
+var currentTypeMap = {};
+function loadImage(objId,imageType,td){
+	$.ajax({
+        type:'post',
+        url:'${ctx}/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
+        data:{id:objId,imageType:imageType,time:new Date().getTime()},
+        dataType:'json',
+        success:function(msg){
+        	var amount = msg.count;
+        	if(amount <=0){
+        		jShowResult('未找到' + imageType);
+        	}else{
+        		currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
+        		currentType = imageType;
+        		document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
+        	}
+        },
+        error:function(XMLHttpRequest, textStatus, errorThrown){
+        }
+    });
+	if(td){
+		jQuery("#materialTable tr").css("background" , "#FFFFFF");
+		jQuery(td).parent().css("background" , "#eeeeee");
+	}
+}
+function nextPage(){
+	if(isUndefinedOrNullOrEmpty(currentType)){
+		jShowResult('请先选择要显示的内容');
+		return;
+	}
+	var cur = currentTypeMap[currentType];
+	if(isUndefinedOrNull(cur)){
+		jShowResult('要显示的内容不存在');
+		return;
+	}
+	if(parseInt(cur.page) >= parseInt(cur.count)){
+		jShowResult('已经是最后一页');
+		return;
+	}
+	cur.page = parseInt(cur.page) + 1;
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+}
+function prevPage(){
+	if(isUndefinedOrNullOrEmpty(currentType)){
+		jShowResult('请先选择要显示的内容');
+		return;
+	}
+	var cur = currentTypeMap[currentType];
+	if(isUndefinedOrNull(cur)){
+		jShowResult('要显示的内容不存在');
+		return;
+	}
+	if(parseInt(cur.page) <= 1){
+		jShowResult('已经是第一页');
+		return;
+	}
+	cur.page = parseInt(cur.page) - 1;
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+}
 /**
  * 加载材料定义的注意事项
  */
@@ -92,17 +176,18 @@
 }
 //加载器械包图片
 function loadTousseImage(){
+	currentType = '';
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date().getTime();
 }
 
 function initPic(){
 	var url = null;
 	if(tousseName!=null && tousseName != ''){
-	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
+	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date().getTime();
 	    getTousseMaterial();
 	}else{
-		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date();
+		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date().getTime();
 		getMaterial();
 	}
 	document.getElementById('tousseOrMaterialImage').src = url;
@@ -161,23 +246,32 @@
         <div id="imageAndMaterialID" align="center">
 			<div style="width:5px;height:537px;border-width:0px;border-style:solid; border-color:red;float:left;"></div>
             <div id="ImageID" class="left" >
-                <img id="tousseOrMaterialImage" style="width:568px;height:400px;vertical-align:left;"></img>
+                <img id="tousseOrMaterialImage" style="width:500px;height:352px;vertical-align:left;"></img>
                 <div class="remark-box">
-					<div class="box" style="width:568px;height:45px;text-align:left;">
+					<div class="box" style="width:500px;height:60px;text-align:left;">
 						<h4 class="noticetitle">注意事项</h4>
                			<div class="notice" id="materialRemark">
                			</div>
                		</div>
             	</div>
+            	
+            	<div class="btn-box" style="width:500px;height:30px;text-align:left;margin-top:5px;">
+						<a href="javascript:void(0)" onclick='onOperationGuideClick();'>清洗操作指引</a>
+						<a href="javascript:void(0)" onclick='prevPage();'>上一页</a>
+						<a href="javascript:void(0)" onclick='nextPage();'>下一页</a>
+						
+               	</div>
             </div>
             <div class="image-box" id="MaterialDIV">
                 <div id="MaterialID" class="table">
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr class="title">
-                                <th width="30%">材料名称</th>
-                                <th width="12%">数量</th>
+                                <th width="22%">材料名称</th>
+                                <th width="8%">数量</th>
+                                <th width="12%">是否可拆</th>
+                                <th width="12%">清洗方式</th>
                                 <th width="29%">清洗质量检查关注点</th>
-                                <th width="29%">功能检查</th>
+                                <th width="17%">功能检查</th>
                             </tr>
                         </table>
                         <div class="box" id="materialDIV">
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
===================================================================
diff -u -r24066 -r24075
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java	(.../ImageFile.java)	(revision 24066)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java	(.../ImageFile.java)	(revision 24075)
@@ -9,17 +9,17 @@
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.persistence.Index;
+import javax.persistence.Table;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
 /**
@@ -47,6 +47,7 @@
 	public static final String IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = "材料清洗质量检查方法图片";
 	public static final String IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = "材料功能检查图片";
 	public static final String IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT = "材料清洗质量检查关注点图片";
+	public static final String IMAGE_TYPE_TOUSSE_WASHGUIDE = "清洗操作指引图片";
 	public static final String IMAGE_TYPE_TOUSSEPACKING = "器械包装配教学图片";
 	public static final String IMAGE_TYPE_QUALITYMONITORING = "质量监测图片";
 	public static final String IMAGE_TYPE_STAFFARCHIVE = "员工头像";
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r23827 -r24075
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 23827)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 24075)
@@ -34,7 +34,6 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
-import com.forgon.tools.util.FileUtils;
 import com.forgon.tools.util.SqlUtils;
 
 /**
@@ -203,14 +202,9 @@
 					if(md == null){
 						continue;
 					}
-					String materialName = md.getName();
-					String specification = md.getSpecification();
-					if (StringUtils.isNotBlank(specification)) {
-						materialName += "[" + specification + "]";
-					}
 					Integer amount = mi.getCount();
 					JSONObject obj = new JSONObject();
-					obj.put("materialName", materialName);
+					obj.put("materialName", md.getNameSpecification());
 					if(tousseDefinition.isForeignTousse()){
 						//二次回收数量
 						if(mi.getApplyAmount() != null){
@@ -226,6 +220,9 @@
 									.getWashClassifyType());
 					obj.put("washQualityCheckPoint", md.getWashQualityCheckPoint());
 					obj.put("functionCheck", md.getFunctionCheck());
+					obj.put("detachable", md.getDetachable());
+					obj.put("washMethod", md.getWashMethod());
+					obj.put("materialDefinitionId", md.getId());
 					array.add(obj);
 				}
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r22653 -r24075
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 24075)
@@ -195,12 +195,12 @@
 .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:536px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:0px 0px}
+.image-box{ width:604px; 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: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:536px}
+.image-box .box table{ margin:0 auto; width:586px}
 .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:17px;}
 .image-box .box .w8{font-size:17px;}
@@ -213,6 +213,9 @@
 .remark-box .box .notice{color:#2e6271;}
 .remark-box .box .noticetitle{text-align:center;font-size:15px;color:#2e6271;}
 
+#imageAndMaterialID .btn-box{margin:auto;font-size:20px; background:#f0f0f0; padding:0px 0px;text-align:center;}
+#imageAndMaterialID .btn-box a{color:#369;text-align:center;text-decoration:none;background:url(tit_bg_01.jpg) repeat-x; height:40px;}
+
 .afrl-box{ width:1980px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
 .afrl-box .table{ border:1px solid #ddd; padding:1px}
 .afrl-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
===================================================================
diff -u -r22273 -r24075
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp	(.../tousseImage.jsp)	(revision 22273)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp	(.../tousseImage.jsp)	(revision 24075)
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -10,7 +11,9 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-message.js"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
+<link rel="stylesheet" href="${ctx}/disinfectsystem/touchScreen/recycle/jShowResult.css"> 
 <script>
 var number = '${param.number}';
 var tousseName = '${param.tousseName}';
@@ -37,14 +40,17 @@
          for (var i=0; i<json.length; i++) {
              var materialName = json[i].materialName;
              var materialAmount = json[i].amount;
-             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>';
+             trData += '<td onclick="onMaterialItemClick(\''+materialName+'\',this);" class="w7" style="width:22.6%;height:40px;" align="center">'+materialName+'</td>';
+             trData += '<td onclick="onMaterialItemClick(\''+materialName+'\',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:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].detachable)+'</td>';
+             trData += '<td class="w8" style="width:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washMethod)+'</td>';
+             trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:29.6%;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
+             trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:15.1%;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>";
+         document.getElementById("myTable").innerHTML = "<table style='table-layout:fixed;' id='materialTable' border='0' cellspacing='0' cellpadding='0'>" + trData + "</table>";
     });
 }
 
@@ -60,16 +66,94 @@
  * 材料被点击时触发
  * @param mName 材料名称,包括规格
  */
-function onMaterialItemClick(mName,tr){
-	loadMaterialPic(mName,tr);
+function onMaterialItemClick(mName,td){
+	loadMaterialPic(mName,td);
 	loadMaterialNotice(mName);
 }
-//加载材料图片.mName:材料名称,tr:当前行对象
-function loadMaterialPic(mName , tr){
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date();
+//加载材料图片.mName:材料名称,td:当前点击的列
+function loadMaterialPic(mName , td){
+	currentType = '';
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date().getTime();
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
-	jQuery(tr).css("background" , "#eeeeee");
+	jQuery(td).parent().css("background" , "#eeeeee");
 }
+//加载是否可拆图片.materialDefinitionId:材料定义的id,td:当前点击的列
+function onDetachableClick(materialDefinitionId , td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onWashQualityCheckPointClick(materialDefinitionId , td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onFunctionCheckClick(materialDefinitionId, td){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
+	loadImage(materialDefinitionId,imageType,td);
+}
+function onOperationGuideClick(){
+	var imageType = '<%=ImageFile.IMAGE_TYPE_TOUSSE_WASHGUIDE%>';
+	loadImage(tousseDefinitionID,imageType);
+}
+var currentType = '';
+var currentTypeMap = {};
+function loadImage(objId,imageType,td){
+	$.ajax({
+        type:'post',
+        url:'${ctx}/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
+        data:{id:objId,imageType:imageType,time:new Date().getTime()},
+        dataType:'json',
+        success:function(msg){
+        	var amount = msg.count;
+        	if(amount <=0){
+        		jShowResult('未找到' + imageType);
+        	}else{
+        		currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
+        		currentType = imageType;
+        		document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
+        	}
+        },
+        error:function(XMLHttpRequest, textStatus, errorThrown){
+        }
+    });
+	if(td){
+		jQuery("#materialTable tr").css("background" , "#FFFFFF");
+		jQuery(td).parent().css("background" , "#eeeeee");
+	}
+}
+function nextPage(){
+	if(isUndefinedOrNullOrEmpty(currentType)){
+		jShowResult('请先选择要显示的内容');
+		return;
+	}
+	var cur = currentTypeMap[currentType];
+	if(isUndefinedOrNull(cur)){
+		jShowResult('要显示的内容不存在');
+		return;
+	}
+	if(parseInt(cur.page) >= parseInt(cur.count)){
+		jShowResult('已经是最后一页');
+		return;
+	}
+	cur.page = parseInt(cur.page) + 1;
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+}
+function prevPage(){
+	if(isUndefinedOrNullOrEmpty(currentType)){
+		jShowResult('请先选择要显示的内容');
+		return;
+	}
+	var cur = currentTypeMap[currentType];
+	if(isUndefinedOrNull(cur)){
+		jShowResult('要显示的内容不存在');
+		return;
+	}
+	if(parseInt(cur.page) <= 1){
+		jShowResult('已经是第一页');
+		return;
+	}
+	cur.page = parseInt(cur.page) - 1;
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+}
 /**
  * 加载材料定义的注意事项
  */
@@ -92,17 +176,18 @@
 }
 //加载器械包图片
 function loadTousseImage(){
+	currentType = '';
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date().getTime();
 }
 
 function initPic(){
 	var url = null;
 	if(tousseName!=null && tousseName != ''){
-	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
+	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date().getTime();
 	    getTousseMaterial();
 	}else{
-		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date();
+		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date().getTime();
 		getMaterial();
 	}
 	document.getElementById('tousseOrMaterialImage').src = url;
@@ -161,23 +246,32 @@
         <div id="imageAndMaterialID" align="center">
 			<div style="width:5px;height:537px;border-width:0px;border-style:solid; border-color:red;float:left;"></div>
             <div id="ImageID" class="left" >
-                <img id="tousseOrMaterialImage" style="width:568px;height:400px;vertical-align:left;"></img>
+                <img id="tousseOrMaterialImage" style="width:500px;height:352px;vertical-align:left;"></img>
                 <div class="remark-box">
-					<div class="box" style="width:568px;height:45px;text-align:left;">
+					<div class="box" style="width:500px;height:60px;text-align:left;">
 						<h4 class="noticetitle">注意事项</h4>
                			<div class="notice" id="materialRemark">
                			</div>
                		</div>
             	</div>
+            	
+            	<div class="btn-box" style="width:500px;height:30px;text-align:left;margin-top:5px;">
+						<a href="javascript:void(0)" onclick='onOperationGuideClick();'>清洗操作指引</a>
+						<a href="javascript:void(0)" onclick='prevPage();'>上一页</a>
+						<a href="javascript:void(0)" onclick='nextPage();'>下一页</a>
+						
+               	</div>
             </div>
             <div class="image-box" id="MaterialDIV">
                 <div id="MaterialID" class="table">
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr class="title">
-                                <th width="30%">材料名称</th>
-                                <th width="12%">数量</th>
+                                <th width="22%">材料名称</th>
+                                <th width="8%">数量</th>
+                                <th width="12%">是否可拆</th>
+                                <th width="12%">清洗方式</th>
                                 <th width="29%">清洗质量检查关注点</th>
-                                <th width="29%">功能检查</th>
+                                <th width="17%">功能检查</th>
                             </tr>
                         </table>
                         <div class="box" id="materialDIV">
