Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r31966 -r31968
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31966)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31968)
@@ -104,7 +104,8 @@
 								urgentAmount: 0,
 								tousseRemark: '',
 								errorDamageQmKey: errorDamageQmKey,
-								spelling: dataArray[i].spelling
+								spelling: dataArray[i].spelling,
+								packed: dataArray[i].packed
 							};
 							addColumnArr.push(toussItem);
 						}
@@ -845,7 +846,7 @@
 		for (var j = 0; j < recyclingErrorJsonArray.length; j++) {
 			var errorAmount = recyclingErrorJsonArray[j].amount;
 			var unconfirmedAmount = recyclingErrorJsonArray[j].unconfirmedAmount;
-			resultAmount += (parseInt(errorAmount)+parseInt(unconfirmedAmount));
+			resultAmount += (parseInt(errorAmount) + parseInt(unconfirmedAmount));
 		}
 		if (resultAmount > 0) {
 			returnMsg = "该器械包有登记丢失信息，请先删除丢失信息后再删除！";
@@ -859,7 +860,7 @@
 			for (var j = 0; j < jsonArray.length; j++) {
 				var errorAmount = jsonArray[j].amount;
 				var unconfirmedAmount = jsonArray[j].unconfirmedAmount;
-				resultAmount += (parseInt(errorAmount)+parseInt(unconfirmedAmount));
+				resultAmount += (parseInt(errorAmount) + parseInt(unconfirmedAmount));
 			}
 			if (resultAmount > 0) {
 				returnMsg = "该器械包有登记报损信息，请先删除报损信息后再删除！";
@@ -1796,19 +1797,19 @@
 				var orgUnitName = $('#depart').text();
 				var tmpRow = $("#tousseItemTable > tbody > tr").length;
 				var row = -1;
-				for(var i=0;i<tmpRow;i++){
-					var tousseName = $('#tousseName'+i).val();
-					if(tousseName == td.name){
+				for (var i = 0; i < tmpRow; i++) {
+					var tousseName = $('#tousseName' + i).val();
+					if (tousseName == td.name) {
 						row = i;
 						continue
 					}
 				}
-				if(row !== -1){
-					tousseDefinitionID = $('#tousseDefinitionID'+row).val();
+				if (row !== -1) {
+					tousseDefinitionID = $('#tousseDefinitionID' + row).val();
 				}
 				var loadedAmount2 = tousseIntoBasketFunction(ti.id, tousseDefinitionID, td.name, 1, td.isCleanedEntirely, orgUnitName, "", ti.barcode, td.tousseType, -1, '否', 2, msg);
 			}
-			if(!msg.isFixedBarcode){
+			if (!msg.isFixedBarcode) {
 				if (!sessionTousseInstance[tousseDefinitionID]) {
 					var barcodeArray = [];
 					var idsArray = [];
@@ -1823,7 +1824,7 @@
 						idsArray1: idsArray//已入筐的id
 					}
 					showResult(sessionTousseInstance[tousseDefinitionID].name + '的实例条码数量为' + sessionTousseInstance[tousseDefinitionID].amount);
-				}else {
+				} else {
 					if (sessionTousseInstance[tousseDefinitionID].barcodeArray.indexOf(ti.barcode) == -1 && sessionTousseInstance[tousseDefinitionID].barcodeArray1.indexOf(ti.barcode) == -1) {
 						sessionTousseInstance[tousseDefinitionID].amount += 1;
 						sessionTousseInstance[tousseDefinitionID].idsArray1.push(ti.id);
@@ -1857,7 +1858,8 @@
 				urgentAmount: 0,
 				tousseRemark: '',
 				errorDamageQmKey: errorDamageQmKey,
-				barcode: ti.barcode
+				barcode: ti.barcode,
+				packed: td.packed
 			};
 			addBindGoods(toussItem, sstsConfig.addTousseAtLastForRecycle);
 			addErrorDamageRemark(ti, tmpRow);
@@ -2280,23 +2282,23 @@
 }
 
 //SSTS-394:回收时标识牌登记丢失入筐后，不应允许直接再改小标识牌的丢失数量
-function isDeleteErrors(row,newTousseDefinitionID,maxAmount){
+function isDeleteErrors(row, newTousseDefinitionID, maxAmount) {
 	var isIDCard = $('#isThereIdentificationCard' + row).val();
 	var isReturn = false;
 	if (isIDCard == '是') {
 		var jsonStr = getJsonParams(false, false);
 		if (jsonStr == '') { return; }
 		var jSONe = JSON.parse(jsonStr);
 		var sumAmount = 0;
-		if(jSONe.tousseJson.length > 0){
-			for(var i=0;i<jSONe.tousseJson.length;i++){
+		if (jSONe.tousseJson.length > 0) {
+			for (var i = 0; i < jSONe.tousseJson.length; i++) {
 				var tousseDefinitionID = jSONe.tousseJson[i].tousseDefinitionID;
 				var amount = jSONe.tousseJson[i].amount;
-				if(tousseDefinitionID == newTousseDefinitionID && jSONe.tousseJson[i].idCardBarcode == ''){
+				if (tousseDefinitionID == newTousseDefinitionID && jSONe.tousseJson[i].idCardBarcode == '') {
 					sumAmount += parseInt(amount);
 				}
 			}
-			if(sumAmount > maxAmount){
+			if (sumAmount > maxAmount) {
 				isReturn = true;
 			}
 		}
@@ -2363,9 +2365,9 @@
 }
 
 // 打开器械包加急的窗口
-function openSetUrgentAmountPage(row) {
+function openSetUrgentAmountPage(row,packed) {
 	var tousseItemId = $('#tousseItemId' + row).val();
-	if (tousseItemId != '') {
+	if (packed) {
 		return false;
 	}
 
@@ -3205,7 +3207,8 @@
 						urgentAmount: 0,
 						tousseRemark: '',
 						errorDamageQmKey: errorDamageQmKey,
-						barcode: ti.barcode
+						barcode: ti.barcode,
+						packed: td.packed
 					};
 					addToussItem(toussItem, sstsConfig.addTousseAtLastForRecycle);
 					addBindGoods(toussItem, sstsConfig.addTousseAtLastForRecycle);
@@ -3251,7 +3254,8 @@
 						urgentAmount: 0,
 						tousseRemark: '',
 						errorDamageQmKey: errorDamageQmKey,
-						barcode: ti.barcode
+						barcode: ti.barcode,
+						packed: td.packed
 					};
 					addToussItem(toussItem, sstsConfig.addTousseAtLastForRecycle);
 					addBindGoods(toussItem, sstsConfig.addTousseAtLastForRecycle);
@@ -3526,7 +3530,8 @@
 								isThereIdentificationCard: record.isThereIdentificationCard,
 								isApplyEntireTousse: record.isApplyEntireTousse,
 								urgentAmount: 0,
-								errorDamageQmKey: errorDamageQmKey
+								errorDamageQmKey: errorDamageQmKey,
+								packed: record.packed
 							};
 							addToussItem(toussItem, appendLast);
 						}
@@ -3604,6 +3609,7 @@
 	var tousseDefinitionID = toussItem.tousseDefinitionID;
 	var urgentAmount = toussItem.urgentAmount;
 	var spelling = toussItem.spelling;
+	var packed = toussItem.packed || false;
 	var tousseRemark = isUndefinedOrNullOrEmpty(toussItem.tousseRemark) ? '' : toussItem.tousseRemark;
 	var urgentLevel = toussItem.urgentLevel ? toussItem.urgentLevel : "";
 	var errorDamageQmKey = toussItem.errorDamageQmKey ? toussItem.errorDamageQmKey : "";
@@ -3708,19 +3714,19 @@
 				msg = urgentLevel;
 				fontSize = "16px";
 			}
-			urgentAmountElement = '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ');">' + msg + '</div>';
+			urgentAmountElement = '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		} else {
 			var bgMsg = "background-image:url(unUrgentBg.png);";
 			var msg = "+";
-			if (!isUndefinedOrNullOrEmpty(tousseItemId)) {
+			if (packed) {
 				bgMsg = "";
 				msg = "";
 			}
 			var fontSize = "30px";//如果要显示加急等级,字体就要小
 			if (sstsConfig.enableUrgentFunction) {
 				fontSize = "16px";
 			}
-			urgentAmountElement = '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ');">' + msg + '</div>';
+			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 = '';
@@ -4719,30 +4725,30 @@
 				if (print && result.recyclingPrintData && result.recyclingPrintData.length > 0) {
 					printRecyclingDetail(result.recyclingPrintData);
 					var appType = $('#appType').val();
-					for(var i = 0; i < result.recyclingPrintData.length;++i){
+					for (var i = 0; i < result.recyclingPrintData.length; ++i) {
 						var recyclingPrintData = result.recyclingPrintData[i];
-						if(sstsConfig.showRecyclingSaveAndPrintActionButton || sstsConfig.showRecyclingSaveAndPrintAndNewActionButton){
-							if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
-								for(var i = 0;i < recyclingPrintData.pages.length;i++){
+						if (sstsConfig.showRecyclingSaveAndPrintActionButton || sstsConfig.showRecyclingSaveAndPrintAndNewActionButton) {
+							if (recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0) {
+								for (var i = 0; i < recyclingPrintData.pages.length; i++) {
 									count++;
 								}
 							}
-						}else if(sstsConfig.showRecyclingPrintDetail){
-							if(appType == '外来器械包申请单' && sstsConfig.recyclingPrintContent == 2){
-								if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
-									for(var i = 0;i < recyclingPrintData.pages.length;i++){
+						} else if (sstsConfig.showRecyclingPrintDetail) {
+							if (appType == '外来器械包申请单' && sstsConfig.recyclingPrintContent == 2) {
+								if (recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0) {
+									for (var i = 0; i < recyclingPrintData.pages.length; i++) {
 										count++;
 									}
 								}
-							}else {
+							} else {
 								count++;
 							}
 						}
 					}
 				}
-				if(count > 0){
-					setTimeout("closeDiv()", 700*count);
-				}else {
+				if (count > 0) {
+					setTimeout("closeDiv()", 700 * count);
+				} else {
 					setTimeout("closeDiv()", 1200);
 				}
 				alertDiv(result.message, true);
@@ -4757,37 +4763,37 @@
 					if (sstsConfig.loadWashBasketsAfterSaveAndCreateNewRecyclingRecord) {
 						if (saveBasketsArr.length > 0) {
 							var basketsStr = saveBasketsArr.join(',');
-							if(count > 0){
-								setTimeout(function(){
+							if (count > 0) {
+								setTimeout(function () {
 									location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser + "&basketsStr=" + basketsStr;
-								}, 700*count);
-							}else {
+								}, 700 * count);
+							} else {
 								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser + "&basketsStr=" + basketsStr;
 							}
 						} else {
-							if(count > 0){
-								setTimeout(function(){
+							if (count > 0) {
+								setTimeout(function () {
 									location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
-								}, 700*count);
-							}else {
+								}, 700 * count);
+							} else {
 								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
 							}
 						}
 					} else {
-						if(count > 0){
-							setTimeout(function(){
+						if (count > 0) {
+							setTimeout(function () {
 								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
-							}, 700*count);
-						}else {
+							}, 700 * count);
+						} else {
 							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
 						}
 					}
 				} else {
-					if(count > 0){
-						setTimeout(function(){
+					if (count > 0) {
+						setTimeout(function () {
 							location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString);
-						}, 700*count);
-					}else {
+						}, 700 * count);
+					} else {
 						location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString);
 					}
 				}
@@ -4844,7 +4850,8 @@
 												urgentLevel: item.urgentLevel,
 												tousseRemark: '',
 												errorDamageQmKey: errorDamageQmKey,
-												spelling: item.spelling
+												spelling: item.spelling,
+												packed: item.packed
 											};
 											addColumnArr.push(toussItem);
 										}
@@ -5949,7 +5956,8 @@
 									urgentAmount: 0,
 									tousseRemark: '',
 									errorDamageQmKey: errorDamageQmKey,
-									spelling: dataArray[i].spelling
+									spelling: dataArray[i].spelling,
+									packed: dataArray[i].packed
 								};
 								addToussItem(toussItem, false);
 							}
@@ -6153,7 +6161,8 @@
 								errorDamageQmKey: errorDamageQmKey,
 								spelling: item.spelling,
 								circuitNurse: circuitNurse,
-								operationRoom: operationRoom
+								operationRoom: operationRoom,
+								packed: item.packed
 							};
 							addToussItem(toussItem, false);
 							canTerminateTousseItemIds.push(item.id);
@@ -6260,7 +6269,7 @@
 	//是否显示保存并打印按钮
 	if (sstsConfig.showRecyclingPrintDetail && $("#appType").val() == TYPE_FOREIGNTOUSSEAPPLIACTION) {
 		$('#saveAndPrintBtnTd').show();
-	}else if(sstsConfig.showRecyclingSaveAndPrintActionButton){
+	} else if (sstsConfig.showRecyclingSaveAndPrintActionButton) {
 		$('#saveAndPrintBtnTd').show();
 	} else {
 		$('#saveAndPrintBtnTd').hide();
@@ -6421,7 +6430,8 @@
 						urgentLevel: tousseItem.urgentLevel,
 						tousseRemark: tousseItem.remark,
 						errorDamageQmKey: errorDamageQmKey,
-						spelling: tousseItem.spelling
+						spelling: tousseItem.spelling,
+						packed: tousseItem.packed
 					};
 					var successAdd = addToussItem(toussItem, false);
 					if (!successAdd) {
@@ -6549,7 +6559,8 @@
 								urgentLevel: applicationitems[i].urgentLevel,
 								tousseRemark: '',
 								errorDamageQmKey: errorDamageQmKey,
-								spelling: applicationitems[i].spelling
+								spelling: applicationitems[i].spelling,
+								packed: applicationitems[i].packed
 							};
 							addToussItem(toussItem, false);
 							canTerminateTousseItemIds.push(applicationitems[i].id);