Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r35334 -r35585
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 35334)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 35585)
@@ -983,6 +983,7 @@
 				}
 			} else if (idCard == '是' && idCardBarcode !== '') {
 				var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
+				var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + i).val();
 				if (tousseOrIDCardInstanceBarcodes !== '') {
 					var arr = tousseOrIDCardInstanceBarcodes.split(';');
 					var index = arr.indexOf(idCardBarcode);
@@ -993,6 +994,16 @@
 						$('#tousseOrIDCardInstanceBarcodes' + i).val('')
 					}
 				}
+				if (idCardInstanceBarcodes !== '') {
+					var arr = idCardInstanceBarcodes.split(';');
+					var index = arr.indexOf(idCardBarcode);
+					arr.splice(index, 1);
+					if (arr.length > 0) {
+						$('#idCardInstanceBarcodes' + i).val(arr.join(';'))
+					} else {
+						$('#idCardInstanceBarcodes' + i).val('')
+					}
+				}
 			}
 			return false;
 		}
@@ -2019,6 +2030,7 @@
 				if ($('#tousseName' + i).val() == td.name && $('#deleted' + i).val() == '0') {
 					var barcodesStr = $('#barcodes' + i).val();
 					var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
+					var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + i).val();
 					setTousseItemLoadedAmountCss(i)
 					if (barcodesStr == "") {
 						var idCardBarcodeArray = new Array();
@@ -2056,6 +2068,16 @@
 							$('#tousseOrIDCardInstanceBarcodes' + i).val(str);
 						}
 					}
+
+					if (idCardInstanceBarcodes == '') {
+						$('#idCardInstanceBarcodes' + i).val(barcode);
+					} else {
+						var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + i).val();
+						if (idCardInstanceBarcodes.indexOf(barcode) == -1) {
+							var str = idCardInstanceBarcodes + ';' + barcode;
+							$('#idCardInstanceBarcodes' + i).val(str);
+						}
+					}
 				}
 			});
 		}
@@ -2534,14 +2556,14 @@
 }
 
 //显示标识牌条码列表
-function showIDCardBarcodes(row, tousseName, tousseOrIDCardInstanceBarcodes) {
+function showIDCardBarcodes(row, tousseName, idCardInstanceBarcodes) {
 	$("#dialogShowIDCardBarcodes").dialog({
 		resizable: false,
 		height: 500,
 		width: 600,
 		modal: true,
 		open: function () {
-			var arr = tousseOrIDCardInstanceBarcodes.split(';');
+			var arr = idCardInstanceBarcodes.split(';');
 			var html = '<table width="100%" border="0" cellspacing="0" cellpadding="0">';
 			html += '<thead>';
 			html += '<tr class="title">';
@@ -2576,18 +2598,24 @@
 	var tousseDefinitionId = $('#tousseDefinitionID' + row).val();
 	var tousseId = $('#tousseDefinitionID' + row).val();
 	var isThereIdentificationCard = $('#isThereIdentificationCard' + row).val();
+	var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + row).val();
 	var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + row).val();
 	var barcode = barcodes || '';
 	var tousseName = $('#tousseName' + row).val();
 	if (isThereIdentificationCard == '是') {
-		if (tousseOrIDCardInstanceBarcodes == '') {
+		if (idCardInstanceBarcodes == '' && tousseOrIDCardInstanceBarcodes == '') {
 			showResult('请先扫描标识牌条码，然后进行拍摄！');
 			return;
-		} else if (tousseOrIDCardInstanceBarcodes.split(';').length == 1) {
-			barcode = tousseOrIDCardInstanceBarcodes;
-		} else {
+		}
+		if(idCardInstanceBarcodes.split(';').length == 1){
+			barcode = idCardInstanceBarcodes;
+		}else if(idCardInstanceBarcodes.split(';').length == 0){
+			if(tousseOrIDCardInstanceBarcodes.split(';').length == 1){
+				barcode = tousseOrIDCardInstanceBarcodes;
+			}
+		}else {
 			if (barcode == '') {
-				showIDCardBarcodes(row, tousseName, tousseOrIDCardInstanceBarcodes);
+				showIDCardBarcodes(row, tousseName, idCardInstanceBarcodes);
 				return
 			}
 		}
@@ -4093,6 +4121,7 @@
 			'<input type="hidden" id="hiddenDamageRemark' + row + '" name="hiddenDamageRemark' + row + '" value="' + damageRemark + '"/>' +
 			'<input type="hidden" id="hiddenErrorDamageQmKey' + row + '" name="hiddenErrorDamageQmKey' + row + '" value="' + errorDamageQmKey + '"/>' +
 			'<input type="hidden" id="tousseOrIDCardInstanceBarcodes' + row + '" name="tousseOrIDCardInstanceBarcodes' + row + '" value="' + barcode + '"/>' +
+			'<input type="hidden" id="idCardInstanceBarcodes' + row + '" name="idCardInstanceBarcodes' + row + '" value=""/>' +
 			'<input type="hidden" id="spelling' + row + '" name="spelling' + row + '" value="' + spelling + '"/>' +
 			'<input type="hidden" id="circuitNurse' + row + '" name="circuitNurse' + row + '" value="' + circuitNurse + '"/>' +
 			'<input type="hidden" id="operationRoom' + row + '" name="operationRoom' + row + '" value="' + operationRoom + '"/>' +