Index: ssts-web/src/main/webapp/common/imgAndVideo.css
===================================================================
diff -u -r30466 -r32117
--- ssts-web/src/main/webapp/common/imgAndVideo.css	(.../imgAndVideo.css)	(revision 30466)
+++ ssts-web/src/main/webapp/common/imgAndVideo.css	(.../imgAndVideo.css)	(revision 32117)
@@ -20,7 +20,6 @@
 	color: black;
 	text-decoration: none;
 	background: #d7d7d7;
-	margin-top: 28px;
 }
 .video_img{
 	float:left; 
@@ -32,11 +31,9 @@
 .spotlight_parent{
 	position: relative;
 	width: 180px;
-    max-width: auto;
     margin: 0vh 10px;
     float: left;
     height: 151px;
-    margin-top: 20px;
 }
 .spotlight,.video_img{
  	float:left;  	
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r31968 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31968)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 32117)
@@ -14,6 +14,8 @@
 // 缓存器械包的科室
 var shareDepartsMap = new newMap();
 var shareDepartsArr = [];
+//缓存拍摄照片或视频的id
+var cameraPhotoInfoMap = new newMap();
 // 缓存清洗装载状态的篮筐条码数组
 var basketArray = [];
 // 缓存扫描的包实例条码
@@ -2365,7 +2367,7 @@
 }
 
 // 打开器械包加急的窗口
-function openSetUrgentAmountPage(row,packed) {
+function openSetUrgentAmountPage(row, packed) {
 	var tousseItemId = $('#tousseItemId' + row).val();
 	if (packed) {
 		return false;
@@ -2424,6 +2426,62 @@
 	});
 }
 
+//FSSDERMYY-13:打开拍照的功能
+function openPhotos(tousseDefinitionID,barcode,tousseName) {
+	var imageIds = '';
+	var videoIds = '';
+	var tousseId = tousseDefinitionID;
+	if((barcode || '') !== ''){
+		tousseId += ';' + barcode;
+	}
+	if(cameraPhotoInfoMap.has(tousseId)){
+		var cameraPhotoInfo = cameraPhotoInfoMap.get(tousseId);
+		imageIds = cameraPhotoInfo.imageFileIds;
+		videoIds = cameraPhotoInfo.videoFileIds;
+	}
+	var params = {
+		tousseDefinitionId: '',
+		goodsName: tousseName,
+		isLook: false,
+		barcode:barcode,
+		imageType: '回收采集图片',
+		videoType: '回收采集视频',
+		imageIds:imageIds,
+		videoIds:videoIds
+	}
+	openCameraPhotoWindow(params, function (value) {
+		if(value == true){
+			var newImageIds = document.getElementById('imageIds').value;
+			var newVideoIds = document.getElementById('videoIds').value;
+			if(newImageIds == '' && newVideoIds == ''){
+				return;
+			}
+			
+			if(newImageIds !== ''){
+				imageIds = newImageIds;
+			}
+
+			if(newVideoIds !== ''){
+				videoIds = newVideoIds;
+			}
+
+			cameraPhotoInfoMap.set(tousseId,{
+				tousseId:tousseDefinitionID,
+				barcode:barcode,
+				imageFileIds:imageIds,
+				videoFileIds:videoIds
+			})
+
+			document.getElementById('imageIds').value = '';
+			document.getElementById('videoIds').value = '';
+		}else {
+			if(cameraPhotoInfoMap.has(tousseId)){
+				cameraPhotoInfoMap.deletes(tousseId);
+			}
+		}
+	});
+}
+
 // 丢失报损界面获取相应的数量
 function getTousseItemRecyclingError(row) {
 	return $('#recyclingError' + row).val();
@@ -3728,6 +3786,7 @@
 			}
 			urgentAmountElement = '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		}
+
 		var textWidth = textSize("26px", "宋体", showTousseName).width || 0;
 		var lineHeight = '';
 		var fontSize = '';
@@ -4074,6 +4133,15 @@
 	return errorJsonArray;
 }
 
+//FSSDERMYY-13:获取拍摄的图片
+function getCameraPhotoInfo(){
+	var arr = [];
+	if(cameraPhotoInfoMap.size() > 0){
+		arr = cameraPhotoInfoMap.values();
+	}
+	return arr;
+}
+
 // 加急物品
 function getUrgentTousseItems() {
 	var urgentItemJsonArray = new Array();
@@ -4386,6 +4454,7 @@
 	paramJson.errorDamageDetail = newArray(getMaterialErrorDamageDetail() || []);
 	paramJson.urgentTousseItems = getUrgentTousseItems();
 	paramJson.confirmation = confirmation;
+	paramJson.cameraPhotoInfo = getCameraPhotoInfo();
 	paramJson.tally = false;
 	paramJson.recyclingItemArray = getRecyclingItemInfo();
 	paramJson.materialsJsonForSave = materialsMapForSave;
@@ -6337,6 +6406,87 @@
 	}
 }
 
+//查询申请单的图片
+function findCameraPhotoInfo(id){
+	$.ajax({
+		type: "post",
+		url: WWWROOT + '/disinfectSystem/recyclingRecordAction!findCameraPhotoInfo.do',
+		data: {
+			recyclingRecordId: id,
+			cameraPhotoType:'回收采集图片,回收采集视频'
+		},
+		dataType: 'json',
+		success: function (result) {
+			if (result.success) {
+				if(result.imageFiles.length > 0){
+					for(var i=0;i<result.imageFiles.length;i++){
+						var tousseDefinitionId = result.imageFiles[i].tousseDefinitionId;
+						var barcode = result.imageFiles[i].barcode || '';
+						var id = result.imageFiles[i].id;
+						var tousseId = tousseDefinitionId;
+						if(barcode !== ''){
+							tousseId += ';' + barcode;
+						}
+						if(cameraPhotoInfoMap.has(tousseId)){
+							var imageFileIds = cameraPhotoInfoMap.get(tousseId).imageFileIds + '';
+							var videoFileIds = cameraPhotoInfoMap.get(tousseId).videoFileIds + '';
+							var arr = [];
+							if(imageFileIds !== ''){
+								arr = imageFileIds.split(',');
+							}
+							arr.push(id);
+							cameraPhotoInfoMap.set(tousseId,{
+								tousseId:tousseDefinitionId,
+								barcode:barcode,
+								imageFileIds:arr.join(','),
+								videoFileIds:videoFileIds
+							})
+						}else {
+							cameraPhotoInfoMap.set(tousseId,{
+								tousseId:tousseDefinitionId,
+								barcode:barcode,
+								imageFileIds:id,
+								videoFileIds:''
+							})
+						}
+					}
+					for(var i=0;i<result.videoFiles.length;i++){
+						var tousseDefinitionId = result.videoFiles[i].tousseDefinitionId;
+						var barcode = result.videoFiles[i].barcode || '';
+						var id = result.videoFiles[i].id;
+						var tousseId = tousseDefinitionId;
+						if(barcode !== ''){
+							tousseId += ';' + barcode;
+						}
+						if(cameraPhotoInfoMap.has(tousseId)){
+							var imageFileIds = cameraPhotoInfoMap.get(tousseId).imageFileIds + '';
+							var videoFileIds = cameraPhotoInfoMap.get(tousseId).videoFileIds + '';
+							var arr = [];
+							if(videoFileIds !== ''){
+								arr = videoFileIds.split(',');
+							}
+							arr.push(id);
+							cameraPhotoInfoMap.set(tousseId,{
+								tousseId:tousseDefinitionId,
+								barcode:barcode,
+								imageFileIds:imageFileIds,
+								videoFileIds:arr.join(',')
+							})
+						}else {
+							cameraPhotoInfoMap.set(tousseId,{
+								tousseId:tousseDefinitionId,
+								barcode:barcode,
+								imageFileIds:'',
+								videoFileIds:id
+							})
+						}
+					}
+				}
+			}
+		}
+	})
+}
+
 // 根据回收记录id加载回收记录的数据
 function loadRecyclingRecordById(id) {
 	DWREngine.setAsync(false);
@@ -6638,12 +6788,17 @@
 								putBasketMaxAmount = 0;
 							}
 
-							var barcode = ci.idCardBarcode;
+							var barcode = ci.idCardBarcode || '';
 							if (ci.tousseInstanceBarcode != undefined) {
 								barcode = ci.tousseInstanceBarcode;
 							}
 							var element = '<input type="hidden" value="">';
-							element += '<dd class="name"><span>' + ci.tousseDefinition.name + '</span></dd>';
+
+							if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){
+								element += '<dd class="name"><span><img onclick="openPhotos('+ci.tousseDefinitionID+',\''+barcode+'\',\''+ci.tousseDefinition.name+'\');" style="width: 24px;cursor: pointer;" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span><span>' + ci.tousseDefinition.name + '</span></dd>';
+							}else {
+								element += '<dd class="name"><span>' + ci.tousseDefinition.name + '</span></dd>';
+							}
 							element += '<dd class="barcode">&nbsp' + barcode + '</dd>';
 							element += '<dd class="num">' + ci.amount + '</dd>';
 							element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【' + ci.tousseDefinition.name + '】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
@@ -6678,6 +6833,7 @@
 			$('.btn-box').css('display', 'block');
 		}
 	});
+	findCameraPhotoInfo(id);
 	DWREngine.setAsync(true);
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r31362 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 31362)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 32117)
@@ -7,28 +7,25 @@
 var imgWidth = parseInt(imgHight/650*866);
 //获取图片id
 function getImageIds() {
-	var imageIdsArr=[];
 	var imageIds = "";
-	$('.spotlight_parent').each(function(index,ele) {
-		if($(this).attr("imgIds") != undefined){
-			imageIdsArr.push($(this).attr("imgIds"));
-		}
-	})
 
-	imageIds = imageIdsArr.join(",");
+	if(window.opener.document.getElementById("imageIds")){
+		var imageIdsDom = window.opener.document.getElementById("imageIds");
+		imageIds = imageIdsDom.value;
+	}
+
 	return imageIds;
 }
 
 //获取视频id
 function getVideoIds() {
-	var videoIdsArr=[];
 	var videoIds = "";
-	$('.spotlight_parent').each(function(index,ele) {
-		if($(this).attr("videoIds") != undefined){
-			videoIdsArr.push($(this).attr("videoIds"));
-		}
-	})
-	videoIds = videoIdsArr.join(",");	
+
+	if(window.opener.document.getElementById("videoIds")){
+		var videoIdsDom = window.opener.document.getElementById("videoIds");
+		videoIds = videoIdsDom.value;
+	}
+	
 	return videoIds;
 }
 
@@ -42,60 +39,67 @@
 		imageType:imageType,
 		videoType:videoType,
 		imageIds:imageIdsData,
-		videoIds:videoIdsData
+		videoIds:videoIdsData,
+		barcode:barcode || ''
 	}
 	if(objectId == '' || objectId == undefined){
 		paramsData.packingTaskId = packingTaskId;
 	}else {
 		paramsData.objectId = objectId;
 	}
+	window.opener.document.getElementById("imageIds").value = imageIdsData;
+	window.opener.document.getElementById("videoIds").value = videoIdsData;
 	$.ajax({
 		type : 'post',		 
 		url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageAndVideoInfo.do',	
 	    data:paramsData,
 		success : function(result) {
 			var data = JSON.parse(result);
 			if(data.success){
+				$("#imgAndVideo").html('');
+				$(".spotlight_parent.local").remove()
+				var list = '';
 				if(data.imageArray.length > 0){
 					for(var i = 0;i < data.imageArray.length; i++){
 						var imgUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ data.imageArray[i].id+'&original=false';
-						var imgList = "<div class='spotlight_parent' imgIds='"+data.imageArray[i].id+"'><a class='spotlight' href='"+imgUrl+"'>";
-							imgList += "<img src='"+imgUrl+"'/>";
-							imgList += "</a>";
-							if(isLook == 'true'){
-								imgList += "<div class='model' onclick='triggerLookImgVideo(event,this,false);'>";								
-							}else{
-								imgList += "<div class='model on' onclick='triggerLookImgVideo(event,this,false);'>";
-							}							
-							imgList += "<span imageId='"+data.imageArray[i].id+"'  onclick='removeImgVideo(event,this,false,true);'></span>";
-							imgList += "<span imageId='"+data.imageArray[i].id+"' class='downloadOriginal' title='查看原图'  onclick='downOriginal(event,this,false);'></span>";
-							imgList += "</div>";
-							imgList += "<em class='imgs_form'>已上传</em>";						
-							imgList += "</div>";			
-						$("#imgVideoBtn").before(imgList);
+						list += "<div class='spotlight_parent' imgIds='"+data.imageArray[i].id+"'><a class='spotlight' href='"+imgUrl+"'>";
+						list += "<img src='"+imgUrl+"'/>";
+						list += "</a>";
+						if(isLook == 'true'){
+							list += "<div class='model' onclick='triggerLookImgVideo(event,this,false);'>";								
+						}else{
+							list += "<div class='model on' onclick='triggerLookImgVideo(event,this,false);'>";
+						}							
+						list += "<span imageId='"+data.imageArray[i].id+"'  onclick='removeImgVideo(event,this,false,true);'></span>";
+						list += "<span imageId='"+data.imageArray[i].id+"' class='downloadOriginal' title='查看原图'  onclick='downOriginal(event,this,false);'></span>";
+						list += "</div>";
+						list += "<em class='imgs_form'>已上传</em>";						
+						list += "</div>";			
 					}
 				}
 				
 				if(data.videoArray.length > 0){
 					for(var j = 0;j < data.videoArray.length; j++){
 						var videoUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getVideoById.do?videoId='+data.videoArray[j].id+'&original=false';
 						var bigVideoUrl = WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getVideoById.do?videoId='+data.videoArray[j].id+'&original=true';
-						var videoList = "<div class='spotlight_parent' videoIds='"+data.videoArray[j].id+"' ><a class='video_img' bigVideoUrl= '"+bigVideoUrl+"' onclick='openVideoOrImg(event,true,this);'>";
-							videoList += "<video src='"+videoUrl+"' style='width:180px;height:151px;object-fit: fill;margin: 1vh 0px;'></video>";
-							videoList += "</a>";
-							if(isLook == 'true'){
-								videoList += "<div class='model' onclick='triggerLookImgVideo(event,this,true);'>";								
-							}else{
-								videoList += "<div class='model on' onclick='triggerLookImgVideo(event,this,true);'>";	
-							}
-							
-							videoList += "<span videoId='"+data.videoArray[j].id+"'  onclick='removeImgVideo(event,this,true,true);'></span></div>";
-							videoList += "<em class='video_form'>已上传</em>";
-							videoList += "<strong class='duration'>" +data.videoArray[j].duration+ "</strong>";
-							videoList += "</div>";			
-						$("#imgVideoBtn").before(videoList);
+						list += "<div class='spotlight_parent' videoIds='"+data.videoArray[j].id+"' ><a class='video_img' bigVideoUrl= '"+bigVideoUrl+"' onclick='openVideoOrImg(event,true,this);'>";
+						list += "<video src='"+videoUrl+"' style='width:180px;height:151px;object-fit: fill;margin: 1vh 0px;'></video>";
+						list += "</a>";
+						if(isLook == 'true'){
+							list += "<div class='model' onclick='triggerLookImgVideo(event,this,true);'>";								
+						}else{
+							list += "<div class='model on' onclick='triggerLookImgVideo(event,this,true);'>";	
+						}
+						
+						list += "<span videoId='"+data.videoArray[j].id+"'  onclick='removeImgVideo(event,this,true,true);'></span></div>";
+						list += "<em class='video_form'>已上传</em>";
+						list += "<strong class='duration'>" +data.videoArray[j].duration+ "</strong>";
+						list += "</div>";			
 					}
 				}
+
+				$("#imgAndVideo").html(list);
+				
 				updateImgVideoNum();
 			}
 		}
@@ -118,6 +122,7 @@
 	$(".spotlight-group").show();
 	$("#videoShow").hide();	
 	$(".close_video").hide();
+	$("#imgAndVideo").show();
 	if(isLook == 'true'){
 		$(".uploading").hide();
 	}else{
@@ -184,6 +189,7 @@
 function openVideoOrImg(event,isLoading,that){
 	$(".uploading").hide();
 	$(".close_video").show();
+	$('#imgAndVideo').hide();
 	event.preventDefault();	
 	var result = document.getElementById("videoShow");
 	$("#videoShow").children("video").attr("src","");
@@ -221,8 +227,8 @@
 	event.preventDefault(); //阻止默认事件
 	event.stopPropagation();  //阻止冒泡
 	if(isLocalServer ){//后台删除
-		var imageId = $(that).attr("imageId");
-		var videoId = $(that).attr("videoId");
+		var imageId = $(that).attr("imageId") || '';
+		var videoId = $(that).attr("videoId") || '';
 		var imageIds =  getImageIds();
 		var videoIds = getVideoIds();
 		$.ajax({
@@ -247,6 +253,23 @@
 					}
 					updateImgVideoNum();
 					layer.msg(data.message, {icon: 1});
+					if(imageId !== '' && window.opener.document.getElementById("imageIds")){
+						var value = window.opener.document.getElementById("imageIds").value;
+						var arr = value.split(',');
+						var index = arr.indexOf(imageId);
+						arr.splice(index,1);
+						window.opener.document.getElementById("imageIds").value = arr.join(',');
+					}
+			
+					if(videoId !== '' && window.opener.document.getElementById("videoIds")){
+						var value = window.opener.document.getElementById("videoIds").value;
+						var arr = value.split(',');
+						var index = arr.indexOf(videoId);
+						arr.splice(index,1)
+						window.opener.document.getElementById("videoIds").value = arr.join(',');
+					}
+				}else {
+					layer.msg(data.message, {icon: 2});
 				}
 			}
 		});
@@ -331,7 +354,8 @@
 		'size' : size, 
 		'fileTypes' : fileTypes,
 		'imageType':imageTypeEncode,
-		'videoType':videoTypeEncode
+		'videoType':videoTypeEncode,
+		'barcode':barcode || ''
 	}
 	if(objectId == '' || objectId == undefined){
 		paramsData.packingTaskId = packingTaskId;
@@ -350,7 +374,6 @@
 			if(data.success){
 				var imageIds = data.imageIds;
 				var videoIds = data.videoIds;
-				
 				//置空
 				blobs = [];
 				size = null;
@@ -382,23 +405,8 @@
 					window.opener.videoIdsArry.push(videoIds);
 				}
 			
-				
-				$("#imgVideoBtn").prevAll().remove();
 				loadingVideoAndImg(imageIds,videoIds);
-				if(imageIds != ""){
-					var imageIdsAll = imageIds.split(",");
-					for(var i = 0;i < imageIdsAll.length;i++){
-						returnImageFileId(goodsName,imageIdsAll[i]);
-					}
-				}
 				
-				if(videoIds != ""){
-					var videoIdsAll = videoIds.split(",");					
-					for(var j = 0;j < videoIdsAll.length;j++){
-						returnVideoFileId(goodsName,videoIdsAll[j]);
-					}
-				}
-				
 				//传给上级页面用做提交的参数
 				if(window.opener.document.getElementById("imageIdsAndGoodsName")){
 					var imageIdsAndGoodsName = window.opener.document.getElementById("imageIdsAndGoodsName");
@@ -412,12 +420,12 @@
 			
 				if(window.opener.document.getElementById("imageIds")){
 					var imageIdsDom = window.opener.document.getElementById("imageIds");
-					imageIdsDom.value = JSON.stringify(imageIds);
+					imageIdsDom.value = imageIds;
 				}
-				
+
 				if(window.opener.document.getElementById("videoIds")){
 					var videoIdsDom = window.opener.document.getElementById("videoIds");
-					videoIdsDom.value = JSON.stringify(videoIds);	
+					videoIdsDom.value = videoIds;	
 				}
 				
 				$("#loading").hide();
@@ -430,16 +438,111 @@
 	})
 }
 
+//FSSDERMYY-13:获取图片信息
+function loadingVideoAndImg2(invoicePlanId,tousseId,tousseItemId){
+	$.ajax({
+		type : 'post',		 
+		url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageAndVideoInfoByTousseItemId.do',	
+	    data:{
+			'tousseItemId':tousseItemId,
+			'tousseId':tousseId,
+			'invoicePlanId':invoicePlanId
+		},
+		success : function(result) {
+			var data = JSON.parse(result);
+			if(data.success){
+				var map = new newMap();
+				if(data.imageArray.length > 0){
+					for(var i = 0;i < data.imageArray.length; i++){
+						var barcode = data.imageArray[i].barcode;
+						data.imageArray[i].type = 'image';
+						if(map.has(barcode)){
+							var arr = map.get(barcode);
+							arr.push(data.imageArray[i])
+							map.set(barcode,arr);
+						}else {
+							var arr = [];
+							arr.push(data.imageArray[i])
+							map.set(barcode,arr);
+						}
+					}
+				}
+				
+				if(data.videoArray.length > 0){
+					for(var i = 0;i < data.videoArray.length; i++){
+						var barcode = data.videoArray[i].barcode;
+						data.videoArray[i].type = 'video';
+						if(map.has(barcode)){
+							var arr = map.get(barcode);
+							arr.push(data.videoArray[i])
+							map.set(barcode,arr);
+						}else {
+							var arr = [];
+							arr.push(data.videoArray[i])
+							map.set(barcode,arr);
+						}
+					}
+				}
+				map.forEach(function(value,key){
+					var html = "<div style='min-height: 210px;'>";
+					if(key){
+						html += '<p style="text-align: left;color: #000;padding-left: 10px;">条码：'+key+'</p>';
+					}
+					for(var i=0;i<value.length;i++){
+						if(value[i].type == 'image'){
+							var imgUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ value[i].id+'&original=false';
+							html += "<div class='spotlight_parent' imgIds='"+value[i].id+"'><a class='spotlight' href='"+imgUrl+"'>";
+							html += "<img src='"+imgUrl+"'/>";
+							html += "</a>";
+							if(isLook == 'true'){
+								html += "<div class='model' onclick='triggerLookImgVideo(event,this,false);'>";								
+							}else{
+								html += "<div class='model on' onclick='triggerLookImgVideo(event,this,false);'>";
+							}							
+							html += "<span imageId='"+value[i].id+"'  onclick='removeImgVideo(event,this,false,true);'></span>";
+							html += "<span imageId='"+value[i].id+"' class='downloadOriginal' title='查看原图'  onclick='downOriginal(event,this,false);'></span>";
+							html += "</div>";
+							html += "<em class='imgs_form'>已上传</em>";						
+							html += "</div>";
+						}else {
+							var videoUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getVideoById.do?videoId='+value[i].id+'&original=false';
+							var bigVideoUrl = WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getVideoById.do?videoId='+value[i].id+'&original=true';
+							html += "<div class='spotlight_parent' videoIds='"+value[i].id+"' ><a class='video_img' bigVideoUrl= '"+bigVideoUrl+"' onclick='openVideoOrImg(event,true,this);'>";
+							html += "<video src='"+videoUrl+"' style='width:180px;height:151px;object-fit: fill;margin: 1vh 0px;'></video>";
+							html += "</a>";
+							if(isLook == 'true'){
+								html += "<div class='model' onclick='triggerLookImgVideo(event,this,true);'>";								
+							}else{
+								html += "<div class='model on' onclick='triggerLookImgVideo(event,this,true);'>";	
+							}
+							html += "<span videoId='"+value[i].id+"'  onclick='removeImgVideo(event,this,true,true);'></span></div>";
+							html += "<em class='video_form'>已上传</em>";
+							html += "<strong class='duration'>" +value[i].duration || ''+ "</strong>";
+							html += "</div>";		
+						}
+					}
+					html += '</div>';
+					$("#imgAndVideo").append(html);
+				})
+				updateImgVideoNum();
+			}
+		}
+	})
+}
+
 $(function(){
 	if(isLook == 'true'){//需要拍摄和上传，就显示拍摄按钮和上传按钮
 		$(".uploading").hide();
 		$("#imgVideoBtn").hide();
 	}else{
 		$(".uploading").show();
 	}
-	
 	//加载图片和视频
-	loadingVideoAndImg(imageIdsData,videoIdsData);
+	if(invoicePlanId !== ''){
+		loadingVideoAndImg2(invoicePlanId,tousseId,tousseItemId);
+	}else {
+		loadingVideoAndImg(imageIdsData,videoIdsData);
+	}
 })
 
 /* 页面卸载时，关掉摄像头页面 */
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r31788 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 31788)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 32117)
@@ -605,6 +605,8 @@
     <!--版权 end-->
 </div>
  <input type="hidden" id="departmentSenderHidden" name="departmentSenderHidden"/>
+ <input type="hidden" id="imageIds"/>
+ <input type="hidden" id="videoIds"/>
  <div id="recycleForTouchScreenAudio"></div>
  <div id="recycleAudioAmount"></div>
 </body>
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r31887 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 31887)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 32117)
@@ -196,6 +196,7 @@
 <input type="hidden" id="videoIdsAndGoodsName" value="" name="videoIdsAndGoodsName"/>
 <input type="hidden" id="imageIds" value="" name="imageIds"/>
 <input type="hidden" id="videoIds" value="" name="videoIds"/>
+<input type="hidden" id="hiddenRecyclingApplicantID" value="" name="hiddenRecyclingApplicantID"/>
 </body>
 
 <script type="text/javascript" src="${ctx}/js/LAB.js?version=${svnRevision}"></script>
@@ -423,6 +424,12 @@
 	SSTS_ForeignTousseApplication_Return = false;
 </operation:authorize>
 
+//查看拍摄图片/视频
+var SSTS_ShowCameraPhotoAndVideo = false;
+<operation:authorize ifAnyGranted="SSTS_ShowCameraPhotoAndVideo">
+	SSTS_ShowCameraPhotoAndVideo = true;
+</operation:authorize>
+
 //汇总状态
 var gatherStatusYes = '<%=InvoicePlan.GATHERSTATUS_YES%>';
 var gatherStatusNo = '<%=InvoicePlan.GATHERSTATUS_NO%>';
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp
===================================================================
diff -u -r31362 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 31362)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 32117)
@@ -21,9 +21,13 @@
 	var imageType = '${param.imageType}'; 
 	var videoType = '${param.videoType}';
 	var goodsName = '${param.goodsName}';
+	var barcode = '${param.barcode}';
 	var imageIds = '${param.imageIds}';
 	var videoIds = '${param.videoIds}';
-	var isLook = '${param.isLook}';	
+	var isLook = '${param.isLook}';
+	var tousseItemId = '${param.tousseItemId}';
+	var tousseId = '${param.tousseId}';
+	var invoicePlanId = '${param.invoicePlanId}';
 	imageIds = imageIds.replace(/"/g,"");
 	videoIds = videoIds.replace(/"/g,"");
 </script> 
@@ -44,16 +48,7 @@
 		<button type="button" onclick="uploadingVideoImg();" class="uploading">上传</button>
 		<div id="videoShow" class="video_show"></div>
 		<p class="spotlight-group spotlight-width">
-		   <!--  <b>Anchors &amp; Images</b> -->
-			<!-- <a class="spotlight" href="gallery/t4.png" data-description="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.">
-				<img src="gallery/t4.png" alt="Lorem ipsum dolor sit amet">
-			</a>
-			<a class="spotlight" href="gallery/t5.png">
-				<img src="gallery/t5.png">
-			</a>
-			<a class="spotlight" href="gallery/t6.png">
-				<img src="gallery/t6.png">
-			</a> -->
+			<div id="imgAndVideo"></div>
 			<a href="javascript:void(0);" class="img_video_btn" onclick="imgAndVideoBtn();" id="imgVideoBtn">
 				<img src="${ctx}/images/web/takeVideo.png"/>
 				<b>拍摄</b>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r31136 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 31136)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 32117)
@@ -103,11 +103,28 @@
 	}
 	top.Ext.getCmp('scanBarcode').setValue();
 }
+//FSSDERMYY-13：查看图片
+function openPhotos(tousseItemId,tousseId){
+	var hiddenRecyclingApplicantID = $('#hiddenRecyclingApplicantID').val();
+	var params = {
+		tousseId: tousseId,
+		tousseItemId: tousseItemId,
+		invoicePlanId:hiddenRecyclingApplicantID,
+		isLook: true
+	}
+	openCameraPhotoWindow(params);
+}
 /**
  * 展示器械包信息renderer.
  */
 function showTousseInfoDiv(v,p,record,rowIndex, columnIndex, store) {
-	var newV = "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "')\" class=\"linkstyle\">" + v + "</span>";
+	var newV = '';
+	var tousseItemId = parseInt(record.raw.id);
+	var tousseId = parseInt(record.raw.tousseDefinitionID);
+	if(record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo){
+		newV += '<span><img onclick="getCurrentTab().openPhotos('+tousseItemId+','+tousseId+');" style="width: 14px;margin-right:5px;cursor: pointer;vertical-align:middle;" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
+	}
+	newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "')\" class=\"linkstyle\">" + v + "</span>";
 	return newV;
 }
 function addForeignProxyDisinfectionItem(){
Index: ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js
===================================================================
diff -u -r31934 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js	(.../config.js)	(revision 31934)
+++ ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js	(.../config.js)	(revision 32117)
@@ -141,6 +141,10 @@
   needBeStrongPwdWhenModifyPwd:{'minPwdLength':8,'windowsPasswordComplexityReq':true,'passwordNotContainLoginName':true},
   //隐藏培训管理模块 true或者没有配置:隐藏        false:不隐藏
   hideTrainingManage:false,
+  //启用回收拍摄功能
+  showCameraPhoto:true,
+  //是否启用回收拍摄功能
+  showCameraPhotoInRecyclingModule:true,
   //提取住院号的正则表达式
   regExpForExtractingHospitalNumber:"\"PatNO\":\"(.*?)\"}",
   //提取诊疗号的正则表达式
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r31887 -r32117
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 31887)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 32117)
@@ -824,6 +824,8 @@
 	var tousseColumnArr = [{
 		dataIndex:'id', hidden:true
 	},{
+		dataIndex : 'showCameraPhoto',hidden : true
+	},{
 		header:"物品", dataIndex:'name', xtype:'treecolumn',flex:1, sortable:false, renderer:showTousseInfoDiv
 	},{  //因为一次性物品不会出现在左边的grid，但是别删掉，隐藏就好（有用处）
         header:"包装规格", dataIndex:'packageSpec', width:65 * fontSizeScale, hidden:(true), menuDisabled:true
@@ -1032,6 +1034,8 @@
 	var tousseColumnArr2 = [{
 		dataIndex : 'id',hidden : true
 	},{
+		dataIndex : 'showCameraPhoto',hidden : true
+	},{
 		header : "物品",xtype : 'treecolumn',dataIndex : 'name',width: (top.screen.width > 1280 ? 210 : 150),/*flex:1,*/sortable: false, renderer:showTousseInfoDiv
 	},{
 		header : "最小单位数量",dataIndex : 'unitCount',hidden: productMode,sortable: false
@@ -2471,6 +2475,7 @@
 			top.Ext4.getCmp('package1').focus('', 10);
 		}
 	} else if (recyclingApplication) {
+		$('#hiddenRecyclingApplicantID').val(id);
 		//设置“申请单id”、“流水号”、“发货状态”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“仓库编码”、“项目”12个属性
 		top.Ext4.getCmp("id").setValue(recyclingApplication.id);
 		top.Ext4.getCmp("serialNumber").setValue(recyclingApplication.serialNumber);