Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
===================================================================
diff -u -r31081 -r31110
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 31081)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 31110)
@@ -144,6 +144,10 @@
 	 * 外来器械包部分拆包装配中(未完全拆完)
 	 */
 	private boolean partPacking;
+	/**
+	 * 已拍装配采集图片
+	 */
+	private boolean packedPhotographed;
 	public Long getTaskId() {
 		return taskId;
 	}
@@ -572,6 +576,14 @@
 	public void setPartPacking(boolean partPacking) {
 		this.partPacking = partPacking;
 	}
+
+	public boolean getPackedPhotographed() {
+		return packedPhotographed;
+	}
+
+	public void setPackedPhotographed(boolean packedPhotographed) {
+		this.packedPhotographed = packedPhotographed;
+	}
 	
 	
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/SplitForeignTousseVo.java
===================================================================
diff -u -r31074 -r31110
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/SplitForeignTousseVo.java	(.../SplitForeignTousseVo.java)	(revision 31074)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/SplitForeignTousseVo.java	(.../SplitForeignTousseVo.java)	(revision 31110)
@@ -37,14 +37,18 @@
 	 * 工具数量
 	 */
 	private Integer toolCount = 0;
-	
+	/**
+	 * 有包实例装配采集图片
+	 */
+	private boolean haveImageFileAmount;
 	public SplitForeignTousseVo(){}
-	public SplitForeignTousseVo(Long tousseInstanceId, String tousseDefinitionName, String isBigPackage, String packageType, String sterilingType){
+	public SplitForeignTousseVo(Long tousseInstanceId, String tousseDefinitionName, String isBigPackage, String packageType, String sterilingType, boolean haveImageFileAmount){
 		this.tousseInstanceId = tousseInstanceId;
 		this.tousseDefinitionName = tousseDefinitionName;
 		this.isBigPackage = isBigPackage;
 		this.packageType = packageType;
 		this.sterilingType = sterilingType;
+		this.haveImageFileAmount = haveImageFileAmount;
 	}
 	public Long getTousseInstanceId() {
 		return tousseInstanceId;
@@ -94,5 +98,11 @@
 	public void setToolCount(Integer toolCount) {
 		this.toolCount = toolCount;
 	}
+	public boolean getHaveImageFileAmount() {
+		return haveImageFileAmount;
+	}
+	public void setHaveImageFileAmount(boolean haveImageFileAmount) {
+		this.haveImageFileAmount = haveImageFileAmount;
+	}
 	
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r31081 -r31110
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 31081)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 31110)
@@ -83,6 +83,7 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
+import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
@@ -138,6 +139,7 @@
 import com.forgon.disinfectsystem.stockmanage.cssdstock.service.TousseStockManager;
 import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager;
 import com.forgon.disinfectsystem.tousse.comboTousse.service.ComboTousseManager;
+import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
@@ -266,6 +268,11 @@
 	
 	private ClassifiedItemManager classifiedItemManager;
 	
+	private ImageFileManager imageFileManager;
+	
+	public void setImageFileManager(ImageFileManager imageFileManager) {
+		this.imageFileManager = imageFileManager;
+	}
 	public void setClassifiedItemManager(
 			ClassifiedItemManager classifiedItemManager) {
 		this.classifiedItemManager = classifiedItemManager;
@@ -1539,6 +1546,10 @@
 				}
 				WaitPackingTaskItemVo itemVo = new WaitPackingTaskItemVo();
 				if(td.isForeignTousse()){
+					int packedImagesCount = imageFileManager.getImagesCount(tousseID, ImageFile.IMAGE_TYPE_CAMERA_PACKING);
+					if(packedImagesCount > 0){
+						itemVo.setPackedPhotographed(true);
+					}
 					Map<Long, Integer> packedMaterialInstanceCountMap = tousseInstanceManager.queryPackedMaterialInstanceCount(task.getId(), td.getId());
 					if(MapUtils.isNotEmpty(packedMaterialInstanceCountMap)){
 						List<MaterialInstance> materialInstances = materialInstanceManager.getByHql(" tousse_id=" + td.getId());
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r31074 -r31110
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 31074)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 31110)
@@ -70,6 +70,7 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
 import com.forgon.disinfectsystem.entity.basedatamanager.expirationdateinfo.ExpirationDateInfo;
+import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.operationRoom.OperationRoom;
@@ -8778,8 +8779,10 @@
     	}else{
     		classifyBasketIdsSql = " ti.classifyBasket_id=" + pt.getClassifyBasket_id();
     	}
-    	String querySql = String.format("select ti.id tousseInstanceId,td.name tousseDefinitionName,td.isBigPackage,ti.packageType,ti.sterilingType,md.name materialDefinitionName,mi.count,md.isImplant "
+    	String querySql = String.format("select ti.id tousseInstanceId,td.name tousseDefinitionName,td.isBigPackage,ti.packageType,ti.sterilingType,md.name materialDefinitionName,mi.count,md.isImplant,(select count(*) from %s where imageType='%s' and objectId=ti.id) ImageFileAmount "
     			+ "from %s ti join %s td on td.id=ti.tousseDefinition_id join %s mi on mi.tousse_id=td.id join %s md on md.id=mi.materialDefinition_id where td.parentID=%s and %s order by ti.id desc ",
+    			ImageFile.class.getSimpleName(),
+    			ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING,
     			TousseInstance.class.getSimpleName(),
     			TousseDefinition.class.getSimpleName(),
     			MaterialInstance.class.getSimpleName(),
@@ -8796,7 +8799,7 @@
 				if(splitForeignTousseVoMap.containsKey(tousseInstanceId)){
 					vo = splitForeignTousseVoMap.get(tousseInstanceId);
 				}else{
-					vo = new SplitForeignTousseVo(tousseInstanceId, rs.getString("tousseDefinitionName"), rs.getString("isBigPackage"), rs.getString("packageType"), rs.getString("sterilingType"));
+					vo = new SplitForeignTousseVo(tousseInstanceId, rs.getString("tousseDefinitionName"), rs.getString("isBigPackage"), rs.getString("packageType"), rs.getString("sterilingType"),rs.getInt("ImageFileAmount")>0?true:false);
 					splitForeignTousseVoMap.put(tousseInstanceId, vo);
 				}
 				String materialDefinitionName = rs.getString("materialDefinitionName");