Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r14700 -r14941
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 14700)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 14941)
@@ -1,10 +1,13 @@
 //展示器械包信息
-function getAndShowTousseInfoDiv(tousseName) {
+function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) {
 	
 	var materialId = null;
 	var materialName = '';
 	var curMaterialPage = 0;
 	var materialTotalPage = 0;
+	var curTousseDefinitionImagePage = 0;
+	var tousseDefinitionImageTotalPage = 0;
+	var curImageType = '器械包';
 	var toolbarPage = new top.Ext4.Toolbar.TextItem({
 		text : '第0页'
 	});
@@ -14,31 +17,59 @@
 	var img_tbar = [ {
 		text : '上一张',
 		handler : function() {
-			if(materialTotalPage == 0){
-				showResult('没有图片');
-				return;
+			if(curImageType == '器械包'){
+				if(tousseDefinitionImageTotalPage == 0){
+					showResult('没有图片');
+					return;
+				}
+				if (curTousseDefinitionImagePage <= 1) {
+					showResult('已是第一页');
+					return;
+				}
+				--curTousseDefinitionImagePage;
+				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+			}else{
+				if(materialTotalPage == 0){
+					showResult('没有图片');
+					return;
+				}
+				if (curMaterialPage <= 1) {
+					showResult('已是第一页');
+					return;
+				}
+				--curMaterialPage;
+				loadCurrentMaterialImage(materialId,materialName);
 			}
-			if (curMaterialPage <= 1) {
-				showResult('已是第一页');
-				return;
-			}
-			--curMaterialPage;
-			loadCurrentMaterialImage(materialId,materialName);
+			
 		}
 	},toolbarPage,
 	toolbarTotalPage,{
 		text : '下一张',
 		handler : function() {
-			if(materialTotalPage == 0){
-				showResult('没有图片');
-				return;
+			if(curImageType == '器械包'){
+				if(tousseDefinitionImageTotalPage == 0){
+					showResult('没有图片');
+					return;
+				}
+				if (curTousseDefinitionImagePage + 1 > tousseDefinitionImageTotalPage) {
+					showResult('已是最后一页');
+					return;
+				}
+				++curTousseDefinitionImagePage;
+				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+			}else{
+				if(materialTotalPage == 0){
+					showResult('没有图片');
+					return;
+				}
+				if (curMaterialPage + 1 > materialTotalPage) {
+					showResult('已是最后一页');
+					return;
+				}
+				++curMaterialPage;
+				loadCurrentMaterialImage(materialId,materialName);
 			}
-			if (curMaterialPage + 1 > materialTotalPage) {
-				showResult('已是最后一页');
-				return;
-			}
-			++curMaterialPage;
-			loadCurrentMaterialImage(materialId,materialName);
+			
 		}
 	}];
 	
@@ -84,6 +115,7 @@
 				materialId =id;
 				materialName = name;
 				top.Ext4.getCmp('imagePanel').setTitle('材料[' + name + '] 图片');
+				curImageType = '材料';
 				var pageStr = result.responseText;
 				materialTotalPage = parseInt(pageStr);
 				curMaterialPage = 0;
@@ -121,19 +153,64 @@
 		var element2 = top.Ext4.get(toolbarPage.el);
 	    element2.update('第' + curMaterialPage + '页');
 	}
+	function loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName){
+		var image = top.Ext4.getCmp('browseImage');
+		image.setSrc('');
+		if(curTousseDefinitionImagePage > 0){
+			var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?name=' + tousseName + '&page=' + curTousseDefinitionImagePage +'&time='+new Date();
+			image.setSrc(url);// 覆盖原来的图片  
+		}
+		var element = top.Ext4.get(toolbarPage.el);
+	    element.update('第' + curTousseDefinitionImagePage + '页');
+	}
+	function clearTousseDefinitionImage(tousseDefinitionId,tousseName){
+		tousseDefinitionImageTotalPage = 0;
+		curTousseDefinitionImagePage = 0;
+		var image = top.Ext4.getCmp('browseImage');
+		image.setSrc('');
+		var element = top.Ext4.get(toolbarTotalPage.el);
+	    element.update('共' + tousseDefinitionImageTotalPage + '页');
+		var element2 = top.Ext4.get(toolbarPage.el);
+	    element2.update('第' + curTousseDefinitionImagePage + '页');
+	}
 
-    function loadTousseInstanceImage(){
-        var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + encodeURIComponent(tousseName)+'&imageType=器械包图片';
-        var image = top.Ext4.getCmp('browseImage');
-        image.setSrc('');
-        image.setSrc(url);// 覆盖原来的图片
+    function loadTousseDefinitionImage(){
+//        var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + encodeURIComponent(tousseName)+'&imageType=器械包图片';
+//        var image = top.Ext4.getCmp('browseImage');
+//        image.setSrc('');
+//        image.setSrc(url);// 覆盖原来的图片
+
+		clearTousseDefinitionImage(id,name);
+		Ext.Ajax.request({
+			url : WWWROOT + "/disinfectSystem/baseData/tousseDefinitionAction!getToussePictureAmount.do",
+			params : {
+				name : tousseName,
+				imageType: '器械包图片'
+			},
+			success : function(result){
+				top.Ext4.getCmp('imagePanel').setTitle('器械包[' + tousseName + '] 图片');
+				curImageType = '器械包';
+				var pageStr = result.responseText;
+				tousseDefinitionImageTotalPage = parseInt(pageStr);
+				curTousseDefinitionImagePage = 0;
+				if(tousseDefinitionImageTotalPage > 0){
+					curTousseDefinitionImagePage = 1;
+				}
+				var element = top.Ext4.get(toolbarTotalPage.el);
+			    element.update('共' + tousseDefinitionImageTotalPage + '页');
+			    loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+			},
+			failure : function(){
+				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+			}
+		});
     }
 	
 	var materialStore = new Ext4.data.Store({
 		proxy : {
 			type : 'ajax',
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
-			extraParams : {tousseName : tousseName},
+			extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
 			reader : {
 				type : 'json'
 			}
@@ -147,7 +224,7 @@
 	
 	var materialToolbar = [{
 		text : '查看器械包图片',
-		handler : loadTousseInstanceImage
+		handler : loadTousseDefinitionImage
 	}];
 	
 	var materialGrid = new top.Ext4.grid.Panel({
@@ -206,5 +283,5 @@
 	});
 	materialStore.load();
 	window.show();
-    loadTousseInstanceImage();
+    loadTousseDefinitionImage();
 }
\ No newline at end of file
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r14923 -r14941
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14923)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14941)
@@ -374,9 +374,13 @@
 		SupplyRoomConfig systemParamsObj = supplyRoomConfigManager
 				.getSystemParamsObj();
 		String saveImagePath = systemParamsObj.getSaveImagePath();
+		String name = StrutsParamUtils.getPraramValue("name", null);
+		if(!DatabaseUtil.isPoIdValid(tousseDefinition.getId())){
+			tousseDefinition = tousseDefinitionManager
+					.getTousseDefinitionByNameForDisplay(name);// 因为现在外来器械包，消毒物品，自定义的包，每次申请时会创建包定义，但是没有记住正确的祖先id，所以此处不能简单的根据包名来取包定义
+		}
+		if (StringUtils.isNumeric(page) && DatabaseUtil.isPoIdValid(tousseDefinition.getId())) {
 
-		if (StringUtils.isNumeric(page) && tousseDefinition.getId() != 0) {
-
 			int index = Integer.parseInt(page);
 			int count = tousseDefinition.getImagesCount(objectDao);
 			if (index <= count) {
@@ -441,9 +445,16 @@
 
 	public void getToussePictureAmount() {
 		String message = "0";
+		String name = StrutsParamUtils.getPraramValue("name", null);
 		String id = StrutsParamUtils.getPraramValue("id", null);
-		TousseDefinition def = tousseDefinitionManager
-				.getTousseDefinitionById(id);
+		TousseDefinition def = null;
+		if(StringUtils.isNotBlank(id)){
+			def = tousseDefinitionManager
+					.getTousseDefinitionById(id);
+		}else{
+			def = tousseDefinitionManager
+					.getTousseDefinitionByNameForDisplay(name);// 因为现在外来器械包，消毒物品，自定义的包，每次申请时会创建包定义，但是没有记住正确的祖先id，所以此处不能简单的根据包名来取包定义
+		}
 		if (def != null ) {
 			message = def.getImagesCount(objectDao) + "";
 		}