Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r33314 -r33904
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 33314)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 33904)
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.UUID;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -29,6 +29,7 @@
 import org.apache.log4j.Logger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.forgon.Constants;
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
@@ -43,6 +44,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ImageVideoObjectIdTable;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -62,8 +64,10 @@
 import com.forgon.tools.SqlBuilder;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.ConfigUtils;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
 
@@ -95,7 +99,13 @@
 	protected Logger logger = Logger.getLogger(this.getClass());
 	
 	private WareHouseManager wareHouseManager;
+	
+	private InitDbConnection dbConnection;
 
+	public void setDbConnection(InitDbConnection dbConnection) {
+		this.dbConnection = dbConnection;
+	}
+
 	public void setWareHouseManager(WareHouseManager wareHouseManager) {
 		this.wareHouseManager = wareHouseManager;
 	}
@@ -438,6 +448,70 @@
 			sqlBuilder.append(" AND po.comboTousseInstanceId is null "); 
 		}
 		
+		//加急级别查询
+		//ZJYY-100 器械包信息模块的查询项新增扩展项【加急级别】和【影像记录】
+		String urgentLevel = sqlWhereParamMap.get("urgentLevel");
+		if(StringUtils.isNotBlank(urgentLevel) && expandColoumnsConfigIncludeFieldName("expandQueryFieldsConfigOfTousseInfoQuery", "urgentLevel")){
+			if(StringUtils.contains(urgentLevel, "全部")){
+				sqlBuilder.append(" AND po.urgentLevel is not null "); 
+			}else{
+				String[] urgentLevelIDArr = urgentLevel.split(",");
+				List<Long> urgentLevelIDList = new ArrayList<Long>();
+				for (String idStr : urgentLevelIDArr) {
+					if(DatabaseUtil.isPoIdValid(idStr)){
+						urgentLevelIDList.add(Long.valueOf(idStr));
+					}
+				}
+				if(CollectionUtils.isNotEmpty(urgentLevelIDList)){
+					sqlBuilder.append(" AND " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.urgentLevel.id", urgentLevelIDList)); 
+				}
+			}
+		}
+		
+		//影像记录查询
+		//ZJYY-100 器械包信息模块的查询项新增扩展项【加急级别】和【影像记录】
+		String tempImgVideoObjectIdTable = ImageVideoObjectIdTable.class.getSimpleName();
+		String tempTableUUID = "";
+		String videoAndPictureRecording = sqlWhereParamMap.get("videoAndPictureRecording");
+		if(expandColoumnsConfigIncludeFieldName("expandQueryFieldsConfigOfTousseInfoQuery", "videoAndPictureRecording") && (StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_NO)
+				|| StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_YES))){
+			tempTableUUID = UUID.randomUUID().toString();
+			String objectIdSql = " po.objectId ";
+			String insertSql = "insert into " + tempImgVideoObjectIdTable + " (Objectid, uuid) select distinct objectId, '" + tempTableUUID + "' ";
+			if(dbConnection.isOracle()){
+				insertSql = "insert into " + tempImgVideoObjectIdTable + " (id, Objectid, uuid) select HIBERNATE_SEQUENCE.Nextval, objectId, '" + tempTableUUID + "' ";
+				objectIdSql = " to_number(po.objectId) ";
+			}
+			insertSql = insertSql + " from ("
+							+ "select " + objectIdSql + " objectId from ImageFile po where po.objectId is not null and po.imageType in ('装配采集图片','器械包装配采集图片')"
+							+ "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 ='回收采集图片' "
+							+ "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 = '回收采集视频' "
+							//外来器械拆分小包的查询
+							+ "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 = '外来器械拆分小包' "
+							+ "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 = '外来器械拆分小包' "
+							+ "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";
+			objectDao.excuteSQL(insertSql);
+			if(StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_YES)){
+				sqlBuilder.append(" and exists (select objectId from " + tempImgVideoObjectIdTable + " where objectId is not null and objectId = po.id) ");
+			}else if(StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_NO)){
+				sqlBuilder.append(" and not exists (select objectId from " + tempImgVideoObjectIdTable + " where objectId is not null and objectId = po.id) ");
+			}
+		}
+		
 		/*由于不追溯的器械包都会生成一个固定条码的包实例,这些包实例的operationTime都是null,
 		器械包信息页面oracle数据库按operationTime降排时默认null都排到最前面了,所以增加此过滤条件*/
 		sqlBuilder.append(" AND operationTime is not null ");
@@ -551,6 +625,8 @@
 		Set<Long> packingRecordIds = new HashSet<Long>();//装配记录id
 		Set<Long> idCardInstanceIDs = new HashSet<Long>();//标识牌id
 		Set<Long> useRecordIDs = new HashSet<Long>();//使用记录id
+		//ZJYY-86 器械包信息模块的信息列表表格新增扩展列【加急级别】和【影像记录】
+		boolean includeVideoAndPictureRecording = expandColoumnsConfigIncludeFieldName("expandColoumnsConfigOfTousseInfoList", "videoAndPictureRecording");
 		for (TousseInstance ti : list) {
 			if(DatabaseUtil.isPoIdValid(ti.getInvoicePlanID())){
 				invoicePlanIds.add(ti.getInvoicePlanID());
@@ -570,12 +646,59 @@
 			if(DatabaseUtil.isPoIdValid(ti.getUseRecord_id())){
 				useRecordIDs.add(ti.getUseRecord_id());
 			}
+			if(includeVideoAndPictureRecording){
+				//ZJYY-100 器械包信息模块的查询项新增扩展项【加急级别】和【影像记录】
+				if(ti.calculateVideoAndPictureAmount(objectDao) > 0){
+					ti.setVideoAndPictureRecording(Constants.HAS_TYPE_YES);
+				}
+			}
 		}
+		
+		if(expandColoumnsConfigIncludeFieldName("expandQueryFieldsConfigOfTousseInfoQuery", "videoAndPictureRecording") && (StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_NO)
+				|| StringUtils.equals(videoAndPictureRecording, Constants.HAS_TYPE_YES))){
+			try {
+				//删除临时表
+				if(StringUtils.isNotBlank(tempTableUUID)){
+					objectDao.excuteSQL(" delete from " + tempImgVideoObjectIdTable + " where UUID = '" + tempTableUUID + "'");
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		
 		// 统一修改返回的数据
 		return updateReturnInfo(gridManager.converJsonString(totalResults, list, sql,TousseInstance.filterProperties),wareHouseId2s,packingRecordIds,invoiceIds,invoicePlanIds,idCardInstanceIDs,useRecordIDs);
 	}
 	
 	/**
+	 * 判断配置项是否包含相应的元素名称
+	 * @param configName	配置项名称
+	 * @param fieldName		元素名称
+	 * @return
+	 */
+	private boolean expandColoumnsConfigIncludeFieldName(String configName,String fieldName) {
+		try {
+			String expandColoumnsConfigOfTousseInfoList = ConfigUtils.getSystemSetConfigByName(configName, "");
+			if(StringUtils.isNotBlank(expandColoumnsConfigOfTousseInfoList)){
+				JSONArray array = JSONArray.fromObject(expandColoumnsConfigOfTousseInfoList);
+				if(array != null && array.size() > 0){
+					for(int i=0;i<array.size();i++){
+						JSONObject json = array.getJSONObject(i);
+						String tempFieldName = json.optString("fieldName", "");
+						if(StringUtils.equals(tempFieldName, fieldName)){
+							return true;
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+	
+
+	/**
 	 * 修改返回的数据
 	 * @param json 
 	 */
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r32767 -r33904
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 32767)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 33904)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition;
 
+import java.sql.ResultSet;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -39,6 +40,7 @@
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.position.TousseOperation;
+import com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
@@ -787,6 +789,12 @@
 	 */
 	private String hasReceived;
 	
+	/**
+	 * 影像记录(不保存到数据库)
+	 * 若该器械包在申请、预回收、回收、装配流程中，有任一过程拍摄照片或视频时，此字段显示为【有】，没有时则显示为空(ZJYY-86)
+	 */
+	private String videoAndPictureRecording = "";
+	
 	public static final String[] filterProperties = { "handler",
 			"hibernateLazyInitializer", "fieldHandler", "materialInstances",
 			"sterilizationRecords", "isUploadImage", "isUploadVideo", "images",
@@ -2820,4 +2828,83 @@
         return Constants.STR_YES;
     }
 
+	@Transient
+	public String getVideoAndPictureRecording() {
+		return videoAndPictureRecording;
+	}
+
+	public void setVideoAndPictureRecording(String videoAndPictureRecording) {
+		this.videoAndPictureRecording = videoAndPictureRecording;
+	}
+	
+	/**
+	 * 计算器械包在申请、预回收、回收、装配流程中，有任一过程拍摄照片或视频数量
+	 * 图片类型：申请采集图片、装配采集图片、包实例装配采集图片、回收采集图片
+	 * 视频类型：申请采集视频、回收采集视频、装配采集视频
+	 * @param objectDao
+	 * @return
+	 */
+	public int calculateVideoAndPictureAmount(ObjectDao objectDao) {
+		//装配采集图片、包实例装配采集图片
+		String imageFileSql = "select count(*) amount from " + ImageFile.class.getSimpleName() + " where 1=1 and ((objectId = '" + this.getId()
+				+ "' and imageType in ('" + ImageFile.IMAGE_TYPE_CAMERA_PACKING + "','" + ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING + "'))";
+		if(this.tousseDefinition != null){
+			//申请采集图片
+			if(this.tousseDefinition.isForeignTousse()){
+				imageFileSql += " or (objectId = '" + tousseDefinition.getId() + "' and imageType = '" + ImageFile.IMAGE_TYPE_CAMERA_APPLICATION + "') ";
+			}else if(this.tousseDefinition.isSplit()){
+				if(tousseDefinition.getParentID() != null){
+					imageFileSql += " or (objectId = '" + tousseDefinition.getParentID() + "' and imageType = '" + ImageFile.IMAGE_TYPE_CAMERA_APPLICATION + "') ";
+				}
+			}
+		}
+		imageFileSql += ") ";
+		if(this.tousseDefinition != null && DatabaseUtil.isPoIdValid(this.getRecyclingRecordId())){
+			//回收采集图片
+			imageFileSql += " union all "
+					+ "select count(*) amount from " + ImageFile.class.getSimpleName() + " "
+					+ "join RecyclingItem ri on ri.id=objectId "
+					+ "where imageType = '" + ImageFile.IMAGE_TYPE_CAMERA_RECYCLING + "' "
+					+ "and ri.tousseDefinitionId=" + tousseDefinition.getId() +" and ri.recyclingRecord_id=" + this.getRecyclingRecordId() + " ";
+		}
+		//视频类型：申请采集视频、回收采集视频、装配采集视频
+		String videoSql = " union all select count(*) amount from " + VideoFile.class.getSimpleName() + " where 1=1 and ((objectId = '" + this.getId() + "' "
+				+ "and videoType = '" + VideoFile.VIDEO_TYPE_CAMERA_PACKING + "') ";
+		if(this.tousseDefinition != null){
+			//申请采集图片
+			if(tousseDefinition.isForeignTousse()){
+				videoSql += " or (objectId = '" + tousseDefinition.getId() + "' and videoType = '" + VideoFile.VIDEO_TYPE_CAMERA_APPLICATION + "') ";
+			}else if(tousseDefinition.isSplit()){
+				if(tousseDefinition.getParentID() != null){
+					videoSql += " or (objectId = '" + tousseDefinition.getParentID() + "' and videoType = '" + VideoFile.VIDEO_TYPE_CAMERA_APPLICATION + "') ";
+				}
+			}
+		}
+		videoSql += ") ";
+		if(this.tousseDefinition != null && DatabaseUtil.isPoIdValid(this.getRecyclingRecordId())){
+			//回收采集视频
+			videoSql += " union all "
+					+ "select count(*) amount from " + VideoFile.class.getSimpleName() + " "
+					+ "join RecyclingItem ri on ri.id=objectId "
+					+ "where videoType = '" + VideoFile.VIDEO_TYPE_CAMERA_RECYCLING + "' "
+					+ "and ri.tousseDefinitionId=" + tousseDefinition.getId() +" and ri.recyclingRecord_id=" + this.getRecyclingRecordId() + " ";
+		}
+		
+		String sql = "select sum(amount) videoAndPictureAmount from (" + imageFileSql + videoSql + ") r ";
+		
+		ResultSet rs = null;
+		int videoAndPictureAmount = 0;
+		try {
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				videoAndPictureAmount = rs.getInt("videoAndPictureAmount");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return videoAndPictureAmount;
+	}
+	
 }
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ImageVideoObjectIdTable.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ImageVideoObjectIdTable.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ImageVideoObjectIdTable.java	(revision 33904)
@@ -0,0 +1,57 @@
+package com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ *	图片视频文件关联对象ID的临时表，用于查询优化
+ */
+@Entity
+@DynamicInsert(false)
+@DynamicUpdate(true)
+public class ImageVideoObjectIdTable {
+	
+	private Long id;
+	
+	/**
+	 * 关联图片的器械包实例ID
+	 */
+	private Long objectId;
+	
+	/**
+	 * 每次查询，创建临时表数据时，生成的UUID;查询完成后，根据这个UUID删除临时表数据
+	 */
+	private String UUID;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getObjectId() {
+		return objectId;
+	}
+
+	public void setObjectId(Long objectId) {
+		this.objectId = objectId;
+	}
+
+	public String getUUID() {
+		return UUID;
+	}
+
+	public void setUUID(String uUID) {
+		UUID = uUID;
+	}
+
+}