Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r33904 -r33911
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 33904)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 33911)
@@ -487,20 +487,20 @@
 							+ "union all "
 							+ "select ti.id objectId from ImageFile po join TousseInstance ti on ti.tousseDefinition_id = po.objectId and  po.objectId is not null and po.imageType in ('申请采集图片') "
 							+ "union all "
-							+ "select " + objectIdSql + " objectId from ImageFile po join RecyclingItem ri on po.objectId = ri.id join TousseInstance ti on ti.tousseDefinition_id = ri.tousseDefinitionId where po.objectId is not null and po.imageType ='回收采集图片' "
+							+ "select ti.id objectId from ImageFile po join RecyclingItem ri on po.objectId = ri.id join TousseInstance ti on ti.tousseDefinition_id = ri.tousseDefinitionId where ri.recyclingRecord_id = ti.recyclingRecordId and po.objectId is not null and po.imageType ='回收采集图片' "
 							+ "union all "
 							+ "select " + objectIdSql + " objectId from VideoFile po where po.objectId is not null and po.videoType = '装配采集视频' "
 							+ "union all "
 							+ "select ti.id objectId from VideoFile v join TousseDefinition td on td.id = v.objectId join TousseInstance ti on ti.tousseDefinition_id = td.id where v.objectId is not null and v.videoType = '申请采集视频' "
 							+ "union all "
-							+ "select ti.id objectId from VideoFile v join RecyclingItem ri on ri.id = v.objectId join TousseInstance ti on ti.tousseDefinition_id = ri.tousseDefinitionId where  v.objectId is not null and v.videoType = '回收采集视频' "
+							+ "select ti.id objectId from VideoFile v join RecyclingItem ri on ri.id = v.objectId join TousseInstance ti on ti.tousseDefinition_id = ri.tousseDefinitionId where ri.recyclingRecord_id = ti.recyclingRecordId and v.objectId is not null and v.videoType = '回收采集视频' "
 							//外来器械拆分小包的查询
 							+ "union all "
 							+ "select ti.id objectId from ImageFile po join TousseDefinition td on td.parentID = po.objectId join TousseInstance ti on ti.tousseDefinition_id = td.id where po.imageType = '申请采集图片' and td.tousseType = '外来器械拆分小包' "
 							+ "union all "
-							+ "select ti.id objectId from ImageFile po join RecyclingItem ri on ri.tousseDefinitionId = po.objectId join TousseDefinition td on td.parentID = ri.tousseDefinitionId join TousseInstance ti on ti.tousseDefinition_id = td.id where po.imageType = '回收采集图片' and td.tousseType = '外来器械拆分小包' "
+							+ "select ti.id objectId from ImageFile po join RecyclingItem ri on ri.tousseDefinitionId = po.objectId join TousseDefinition td on td.parentID = ri.tousseDefinitionId join TousseInstance ti on ti.tousseDefinition_id = td.id where ri.recyclingRecord_id = ti.recyclingRecordId and po.imageType = '回收采集图片' and td.tousseType = '外来器械拆分小包' "
 							+ "union all "
-							+ "select ti.id objectId from VideoFile v join RecyclingItem ri on ri.tousseDefinitionId = v.objectId join TousseDefinition td on td.parentID = ri.tousseDefinitionId join TousseInstance ti on ti.tousseDefinition_id = td.id where v.videoType = '回收采集视频' and td.tousseType = '外来器械拆分小包' "
+							+ "select ti.id objectId from VideoFile v join RecyclingItem ri on ri.tousseDefinitionId = v.objectId join TousseDefinition td on td.parentID = ri.tousseDefinitionId join TousseInstance ti on ti.tousseDefinition_id = td.id where ri.recyclingRecord_id = ti.recyclingRecordId and v.videoType = '回收采集视频' and td.tousseType = '外来器械拆分小包' "
 							+ "union all "
 							+ "select ti.id objectId from VideoFile v join TousseDefinition td on td.parentID = v.objectId join TousseInstance ti on ti.tousseDefinition_id = td.id where v.videoType = '申请采集视频' and td.tousseType = '外来器械拆分小包' "
 							+ ") rs";