Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.jsp
===================================================================
diff -u -r24817 -r24827
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.jsp	(.../interfereReviewView.jsp)	(revision 24817)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.jsp	(.../interfereReviewView.jsp)	(revision 24827)
@@ -60,6 +60,7 @@
 	
 	var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
 	var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
+	var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r24817 -r24827
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 24817)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 24827)
@@ -60,6 +60,7 @@
 	
 	var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
 	var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
+	var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r24817 -r24827
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 24817)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 24827)
@@ -705,12 +705,14 @@
                                 xtype : 'button',
                                 text : '查看拍照图片',
                                 handler : function (){
+                                	var imageType = imageTypeCameraPacking;
                                 	var objectId = tousseDefinitionId;
                                 	//如果是外来器械拆分小包,则传包实例id
                                 	if(tousseType == '外来器械拆分小包'){
                                 		objectId = id;
+                                		imageType = imageTypeTousseInstanceCameraPacking;
                                 	}
-                                	showTousseImages(tousseName,objectId,imageTypeCameraPacking);
+                                	showTousseImages(tousseName,objectId,imageType);
                                 }
                             }]
                         }]
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r24817 -r24827
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 24817)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 24827)
@@ -259,12 +259,14 @@
 					imageCount = td.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_TOUSSE_WASHGUIDE);
 				}
 			}else if (ImageFile.IMAGE_TYPE_CAMERA_PACKING.equals(imageType)){
+				TousseDefinition td = tousseDefinitionManager.get(id);
+				if(td != null){
+					imageCount = td.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_CAMERA_PACKING);
+				}
+			}else if (ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING.equals(imageType)){
 				TousseInstance ti = tousseInstanceManager.get(id);
 				if(ti != null){
-					imageCount = ti.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_CAMERA_PACKING);
-				}else{
-					TousseDefinition td = tousseDefinitionManager.get(id);
-					imageCount = td.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_CAMERA_PACKING);
+					imageCount = ti.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING);
 				}
 			}else if (ImageFile.IMAGE_TYPE_CAMERA_APPLICATION.equals(imageType)){
 				TousseDefinition td = tousseDefinitionManager.get(id);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
===================================================================
diff -u -r24817 -r24827
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 24817)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 24827)
@@ -69,6 +69,7 @@
 
 var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
 var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
+var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>