Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r37786 -r37790
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 37786)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 37790)
@@ -85,14 +85,8 @@
 
 	function loadCurrentImage() {
 		var image = top.Ext4.getCmp('browseImage');
-		var url = '';
-		if(curImageType == '消毒物品图片'){
-			url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + (objectId || "")
-			+ '&page=' + curPage + '&time=' + new Date().getTime();
-		}else {
-			url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + (objectId || "")
+		var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + (objectId || "")
 			+ '&name=' + encodeURIComponent(encodeURIComponent(objectName)) + '&page=' + curPage + '&imageType=' + encodeURIComponent(curImageType) + '&time=' + new Date().getTime();
-		}
 		image.setSrc(url);// 覆盖原来的图片  
 
 		var element = top.Ext4.get(toolbarPage.el);
@@ -126,7 +120,7 @@
 			params: {
 				id: objectId,
 				name: objectName,
-				imageType: curImageType == '消毒物品图片' ? '器械包图片' : curImageType
+				imageType: curImageType
 			},
 			success: function (result) {
 				top.Ext4.getCmp('imagePanel').setTitle(getTitle());
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r37788 -r37790
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 37788)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 37790)
@@ -109,20 +109,21 @@
 	var newV = '';
 	if (record.raw) {
 		var tousseItemId = parseInt(record.raw.id);
-		var tousseId = parseInt(record.raw.tousseDefinitionID);
-		if (record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo) {
-			newV += '<span><img onclick="getCurrentTab().openPhotos(' + tousseItemId + ',' + tousseId + ');" style="width: 14px;margin-right:5px;cursor: pointer;vertical-align:middle;" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
-		}
-		var id = record.raw.tousseDefinitionID;
 		var tousseType = record.raw.tousseType;
+		var id = record.raw.tousseDefinitionID;
+		var newTousseType = '';
 		if(!id){
-			if(record.raw.name == record.parentNode.raw.name){
-				id = record.parentNode.raw.tousseDefinitionID;
-				tousseType = record.parentNode.raw.tousseType;
-			}
+			id = record.raw.materialDefinitionId;
+			newTousseType = '材料图片';
 		}
-		tousseType = tousseType + '图片';
-		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "','" + id + "','" + tousseType + "',1)\" class=\"linkstyle\">" + v + "</span>";
+		if(tousseType == '消毒物品'){
+			newTousseType = '器械包图片';
+		}
+		var tousseId = parseInt(id);
+		if (record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo) {
+			newV += '<span><img onclick="getCurrentTab().openPhotos(' + tousseItemId + ',' + tousseId + ');" style="width: 14px;margin-right:5px;cursor: pointer;vertical-align:middle;" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
+		}
+		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "','" + id + "','" + newTousseType + "',1)\" class=\"linkstyle\">" + v + "</span>";
 		return newV;
 	} else {
 		var id = record.data.tousseDefinitionID;