Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
===================================================================
diff -u -r34210 -r34904
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java	(.../VideoFileAction.java)	(revision 34210)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java	(.../VideoFileAction.java)	(revision 34904)
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
@@ -28,8 +29,10 @@
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.videomanager.service.VideoFileManager;
 import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.json.JSONUtil;
 import com.opensymphony.xwork2.Preparable;
 
 @ParentPackage(value = "default")
@@ -298,7 +301,26 @@
     public void loadTousseTeachingVideo(){
     	String tousseId = StrutsParamUtils.getPraramValue("objectId", null);
 	    String type =	StrutsParamUtils.getPraramValue("videoType", null);
-	    videoFileManager.loadTousseVideoByTdIdAndVideoType(tousseId, type);
+	    JSONObject result = JSONUtil.buildJsonObject(false);
+	    try {
+	    	JSONArray array = videoFileManager.loadTousseVideoByTdIdAndVideoType(tousseId, type);
+	    		if(array == null || array.size() == 0){
+	    			if(StringUtils.equals(type, VideoFile.VIDEO_TYPE_TOUSSE)
+	    					|| StringUtils.equals(type, VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING)){
+	    				TousseDefinition tousseDefinition = tousseDefinitionManager.get(tousseId);
+	    				if(tousseDefinition != null && tousseDefinition.isForeignTousse()){
+	    					array = videoFileManager.loadTousseVideoByTdIdAndVideoType(tousseDefinition.getAncestorID().toString(), type);
+	    				}
+	    			}
+	    		}
+	    	Map<String, Object> map = new HashMap<String, Object>();
+			map.put("success", true);
+			map.put("data", array);
+			result = JSONObject.fromObject(map);
+		} catch (Exception e) {
+			result = JSONUtil.buildJsonObject(false, "加载失败：" + e.getMessage());
+		}
+	    StrutsResponseUtils.output(result);
     }
     //修改视频名称
     public void updateVideoName(){
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r33915 -r34904
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 33915)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 34904)
@@ -350,6 +350,13 @@
 			} else if (ImageFile.IMAGE_TYPE_TOUSSEPACKING.equals(imageType)) {
 				img = imageFileManager.getImageByIdAndType(Long.parseLong(id),
 						ImageFile.IMAGE_TYPE_TOUSSEPACKING, page,originalImg);
+				if(img == null){
+					TousseDefinition tousseDefinition = tousseDefinitionManager.get(Long.parseLong(id));
+					if(tousseDefinition != null && tousseDefinition.isForeignTousse()){
+						img = imageFileManager.getImageByIdAndType(tousseDefinition.getAncestorID(),
+								ImageFile.IMAGE_TYPE_TOUSSEPACKING, page,originalImg);
+					}
+				}
 
 			} else {
 				img = imageFileManager.getImageByIdAndType(Long.parseLong(id),
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
===================================================================
diff -u -r33858 -r34904
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java	(.../VideoFileManagerImpl.java)	(revision 33858)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java	(.../VideoFileManagerImpl.java)	(revision 34904)
@@ -302,13 +302,13 @@
 		objectDao.saveOrUpdate(upVideoFile);
 	}
 	@Override
-	public void loadTousseVideoByTdIdAndVideoType(String objectId,
+	public JSONArray loadTousseVideoByTdIdAndVideoType(String objectId,
 			String videoType) {
+		JSONArray array = new JSONArray();
 		String querySql = "select v.id,v.videoName,v.uuid_videoName,t.name from VideoFile v inner join TousseDefinition t on(v.tousseDefinition_id=t.id) where v.tousseDefinition_id="+ objectId +" and v.videoType='"+ videoType +"' order by v.serialNum asc";
 		ResultSet rs = null;
 		try {
 			rs = objectDao.executeSql(querySql);
-			JSONArray array = new JSONArray();
 			while (rs.next()) {
 				JSONObject obj = new JSONObject();
 				Long id = rs.getLong("id");
@@ -326,17 +326,12 @@
                 obj.put("tousseName", name);
                 array.add(obj);
 			}
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("success", true);
-			map.put("data", array);
-			JSONObject jsonObject = JSONObject.fromObject(map);
-			StrutsResponseUtils.output(jsonObject);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}finally{			
 			DatabaseUtil.closeResultSetAndStatement(rs);	
 		}
-		
+		return array;
 	}
 	@Override
 	public void updateVideoName(String id, String objectId, String oldUuidVideoName,
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
===================================================================
diff -u -r33517 -r34904
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java	(.../VideoFileManager.java)	(revision 33517)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java	(.../VideoFileManager.java)	(revision 34904)
@@ -42,7 +42,7 @@
 	 * @param objectId
 	 * @param videoType
 	 */
-	public void loadTousseVideoByTdIdAndVideoType(String objectId, String videoType);
+	public JSONArray loadTousseVideoByTdIdAndVideoType(String objectId, String videoType);
 	/**
 	 * 修改视频名称
 	 * @param id viodeId