Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
===================================================================
diff -u -r34426 -r34779
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 34426)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 34779)
@@ -165,6 +165,8 @@
 		hiddenColumnsOfInvoiceListView:["签收人","签收时间"],
 		//启用保存时提示用户确认灭菌程序
 		enablePromptUserToConfirmSterilizationProcedureWhenSaving:true,
+		//允许选择多个标识牌的包进行批量装配
+		allowSelectMultipleIDCardsForBatchPacking:true,
 		//启用监测元素可追加到监测记录备注的功能
 		enableInspectElementAppendToRemarkFunction:true
 		}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34768 -r34779
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34768)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34779)
@@ -17,8 +17,8 @@
 var deletePackingTask;
 var showTousseDamageMaterial;
 var idCardBarcode = '';
+var idCardDefinitionId = '';
 var idCardInstanceID = '';
-var idCardInfo = null;
 var currentIDCardInfo = null;
 var idCardTaskNode = null;
 
@@ -411,7 +411,7 @@
 function clearInputedIDCardInfo() {
 	idCardBarcode = '';
 	idCardInstanceID = '';
-	idCardInfo = null;
+	idCardDefinitionId = '';
 	idCardTaskNode = null;
 	Ext4.getCmp('idCardBarcode').setValue();
 	Ext4.getCmp('idCardName').setValue();
@@ -855,7 +855,7 @@
 			Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
 			idCardBarcode = barcode;
 			idCardInstanceID = result.idCard.id;
-			idCardInfo = result.idCard;
+			idCardDefinitionId = result.idCard == null ? '' : result.idCard.idCardDefinition.id;
 			Ext4.getCmp('operatorBarcode').focus();
 		} else {
 			Ext4.getCmp('idCardBarcode').focus();
@@ -4015,13 +4015,38 @@
 			onPackingTousseBtnClickComplete();
 			return;
 		}
-		// 首先处理标识牌的打印
-		var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
-		if (scanScanIDCardBarcode.isVisible(true)) {
-			printIDCardTousse();
-			return;
-		}
 
+		if(sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+			var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
+			var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked();
+			var idCardTaskNodeArr = [];
+			if(basketTreeGridCheckedNodes.length > 0){
+				for(var i=0;i<basketTreeGridCheckedNodes.length;i++){
+					if(basketTreeGridCheckedNodes[i].childNodes.length == 0 && basketTreeGridCheckedNodes[i].data.idCardBarcode !== ''){
+						idCardTaskNodeArr.push(basketTreeGridCheckedNodes[i]);
+					}
+				}
+			}
+			var validate = true;
+			if(idCardTaskNodeArr.length > 0){
+				for(var i=0;i<idCardTaskNodeArr.length;i++){
+					if (!(validateSupplement(idCardTaskNodeArr[i]))) {
+						validate = false;
+					}
+				}
+				if(!validate){
+					onPackingTousseBtnClickComplete();
+					return;
+				}
+			}
+		}else {
+			// 首先处理标识牌的打印
+			var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
+			if (scanScanIDCardBarcode.isVisible(true)) {
+				printIDCardTousse();
+				return;
+			}
+		}
 		if (!validateFormParamsForPack()) {
 			onPackingTousseBtnClickComplete();
 			return;
@@ -4043,9 +4068,10 @@
 			Ext4.each(selNodes, function (pNode) {
 				if (pNode.childNodes.length == 0) {
 					var ai = pNode;
-					if (!map[ai.get('tousseName')]) {
-						dest.push(ai.parentNode);
-						map[ai.get('tousseName')] = ai;
+					var tousseName = ai.get('tousseName')
+					if (!map[tousseName]) {
+						dest.push(ai);
+						map[tousseName] = ai;
 					}
 				}
 			});
@@ -4075,11 +4101,14 @@
 				var pNode = dest[i];
 				var pTousseName = pNode.get('tousseName');
 				var haveIDCard = pNode.get('haveIDCard');
-				// 跳过有标识牌的器械包
-				if (haveIDCard) {
-					showResult("【" + pTousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
-					onPackingTousseBtnClickComplete();
-					return;
+				var idCardBarcode = pNode.get('idCardBarcode');
+				//跳过有标识牌的器械包
+				if(!sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+					if (haveIDCard) {
+						showResult("【" + pTousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage);
+						onPackingTousseBtnClickComplete();
+						return;
+					}
 				}
 				//器械包装配数量
 				var packingAmount = pNode.get('amount');
@@ -4139,7 +4168,7 @@
 							}
 						}
 					}
-					if (cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0) {
+					if (cNode.get('tousseName') == pTousseName && cNode.childNodes.length == 0) {
 						tousseName = cNode.get("tousseName");
 						tousseID = cNode.get("tousseID");
 						status = cNode.get("status");
@@ -4528,7 +4557,7 @@
 			basketBarcode: basketBarcode,
 			scannedBasketBarcodes: scannedBasketBarcodes,
 			idCardInstanceID: idCardInstanceID,
-			idCardDefinitionId: idCardInfo == null ? '' : idCardInfo.idCardDefinition.id,
+			idCardDefinitionId: idCardDefinitionId,
 			sterilizer: sterilizer,
 			frequency: frequency,
 			confirmContinue: '',
@@ -5445,17 +5474,19 @@
 		lastSelectedTousseName = tousseName;
 		// 显示丢失报损按钮
 		showOrHideErrorAndDamageBtn();
-		var idCardBarcodeTemp = record.get("idCardBarcode");
-		if (record.childNodes.length > 0) {
-			idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode");
-		}
-		if (idCardBarcodeTemp != "") {
-			var autoSetIDCardBarcodeForPacking = sstsConfig.autoSetIDCardBarcodeForPacking;
-			loadIdCardByBarcode(idCardBarcodeTemp, false, autoSetIDCardBarcodeForPacking);
-		} else {
-			if (storeId !== 'basketTreeGrid') {
-				clearInputedIDCardInfo();
+		if(!sstsConfig.allowSelectMultipleIDCardsForBatchPacking){
+			var idCardBarcodeTemp = record.get("idCardBarcode");
+			if (record.childNodes.length > 0) {
+				idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode");
 			}
+			if (idCardBarcodeTemp != "") {
+				var autoSetIDCardBarcodeForPacking = sstsConfig.autoSetIDCardBarcodeForPacking;
+				loadIdCardByBarcode(idCardBarcodeTemp, false, autoSetIDCardBarcodeForPacking);
+			} else {
+				if (storeId !== 'basketTreeGrid') {
+					clearInputedIDCardInfo();
+				}
+			}
 		}
 		if (sstsConfig.enablePackingMaterialsCheckFunction) {
 			var keys = getPackingMaterialsForCheck.keys();