Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27630 -r27635
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27630)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27635)
@@ -1183,11 +1183,13 @@
                text : '教学图片',
                hidden : teachingPicture,
                handler : function(){
-            	   var imageName = Ext4.getCmp('imageName').getText();
+				   var imageName = Ext4.getCmp('imageName').getText();
+				   var imageType = Ext4.getCmp('imageType').getValue();
             	   var materialId = Ext4.getCmp('materialId').getValue();
             	   if(imageName != "" && materialId == ""){
 					   var td_id = Ext4.getCmp('td_id').getValue();
-            		   showToussePackingTeachingImage(imageName,td_id);
+					   loadGoodsImage(imageName ,imageType ,'',1 ,'' ,td_id,'器械包装配教学图片');
+            		   //showToussePackingTeachingImage(imageName,td_id);
 				   }
                }
            },
@@ -2078,10 +2080,13 @@
 	var tousseDefinitionID = row.td_id;
 	var currentPage = row.currentPage;
 	var materialId = row.materialId;
+	var imgName = row.imgName;
 	var iframeHeight = $('body').height();
+	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+imgName+'&number='+currentPage;
+	
 	$.magnificPopup.open({
 		items: [{
-			src:WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&number='+currentPage,
+			src:url,
 			type :'iframe'
 		},{
 			//只是为了让箭头出现,如果可以有其他办法,这里可以去掉。因为在tousseImage.jsp内部,修改了下一页和上一页的处理
@@ -2110,8 +2115,13 @@
 		$(".mfp-iframe-scaler iframe").css({"top":"10px","height":"100%"});
 	}
 }
-function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id){
-	var url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + type +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName);
+function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id,imgName){
+	var url;
+	if(imgName == '器械包装配教学图片'){
+		url = WWWROOT+'/disinfectSystem/packingAction!getImage.do?id='+td_id+'&page='+currentPage+'&imageType='+imgName+'&originalImg=true';
+	}else {
+		url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + type +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName);
+	}
 	Ext4.getCmp('imageName').setText(tousseName);
     Ext4.getCmp('imageType').setValue(type);
     Ext4.getCmp('currentPage').setValue(currentPage);
@@ -2137,7 +2147,8 @@
 							td_id:td_id,
 							type:type,
 							materialId:materialId,
-							currentPage:currentPage
+							currentPage:currentPage,
+							imgName:imgName || ''
 						}
 						amendDisinfectionTousse(row);
             			//showImage(this.el.dom.src,tousseName);