Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r36934 -r37051
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 36934)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37051)
@@ -5134,14 +5134,26 @@
 						if (cNode.childNodes.length > 0) {
 							isChackAll = true;
 						}
-						if (cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0) {
+						if (cNode.childNodes.length == 0) {
 							tousseName = cNode.get("tousseName");
+							var idCardBarcode = cNode.get("idCardBarcode");
+							if(idCardBarcode !== ''){
+								if(tousseName !== (pTousseName+'-'+idCardBarcode)){
+									return false;
+								}
+							}else {
+								if(tousseName !== pTousseName){
+									return false;
+								}
+							}
 							var haveIDCard = pNode.get('haveIDCard');
 							// 跳过有标识牌的器械包
-							if (haveIDCard) {
-								showMultipleResult("【" + tousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
-								onPackingTousseBtnClickComplete();
-								return;
+							if (!sstsConfig.allowSelectMultipleIDCardsForBatchPacking || !sstsConfig.autoSetIDCardBarcodeForPacking) {
+								if (haveIDCard) {
+									showMultipleResult("【" + tousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+									onPackingTousseBtnClickComplete();
+									return false;
+								}
 							}
 							var status = cNode.get("status");
 							if (status == '待确认') {
@@ -5183,9 +5195,11 @@
 					} else {
 						lastAmount = parentAmout;
 					}
-					var par = packingTousse(false, '', '', taskIdArray.join(";"), tousseName, tousseType, lastAmount, packageType, sterilingType, supplierName, departmentArray.join(";"), urgentAmount, JSON.stringify(taskIdToAmountMapInfo), noUserFormSterilizationInfo, tousseID);
-					if (par !== false) {
-						params.push(par);
+					if(taskIdArray.length > 0){
+						var par = packingTousse(false, '', '', taskIdArray.join(";"), tousseName, tousseType, lastAmount, packageType, sterilingType, supplierName, departmentArray.join(";"), urgentAmount, JSON.stringify(taskIdToAmountMapInfo), noUserFormSterilizationInfo, tousseID);
+						if (par !== false) {
+							params.push(par);
+						}
 					}
 				}
 				isConfirmRequestPackingTousse(params, 0, false);