Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37192 -r37201
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37192)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37201)
@@ -1194,6 +1194,10 @@
 					showMultipleResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage);
 					return;
 				} else {
+					if(type == 'scan'){
+						var idCardUseAmount = result.idCard.idCardDefinition.useAmount;
+						noticeIdCardUseAmount(tousseName,barcode,idCardUseAmount);
+					}
 					loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking);
 				}
 			}
@@ -1456,6 +1460,7 @@
 			{ name: 'haveRemarkOfApplyGoods' },
 			{ name: 'classifiedItemAmountInfo' },
 			{ name: 'patient' },
+			{ name: 'useAmount' },
 			{ name: 'needInspectMaterials' },
 			{ name: 'washRecordId' }
 		]
@@ -6126,6 +6131,7 @@
 							colorCode: taskVO.colorCode,
 							errorDamageRemarkId: '',
 							errorDamageRemarkInfo: '',
+							useAmount:'',
 							needInspectMaterials: needInspectMaterials,
 							haveRemarkOfApplyGoods: taskVO.haveRemarkOfApplyGoods,
 							tousseID: td_id,
@@ -6182,6 +6188,7 @@
 						var expectUseTime = task.expectUseTime;
 						var urgentAdditionalInfo = task.urgentAdditionalInfo;
 						var maxAmount = task.maxAmount;
+						var useAmount = task.useAmount;
 						var packedPhotographed = task.packedPhotographed;
 						if (task.tousseType == '外来器械包') {
 							haveForeignTousseNode = true;
@@ -6213,6 +6220,7 @@
 							task.packageType = packageType;
 							task.sterilingMethod = sterilingMethod;
 							task.maxAmount = maxAmount;
+							task.useAmount = useAmount;
 							task.packedPhotographed = packedPhotographed;
 							var childNode = addTaskNode(task);
 							parentNode.appendChild(childNode);
@@ -6259,7 +6267,21 @@
 		});
 	}
 
+	// BJ309YY-9:提示标识牌的使用次数
+	function noticeIdCardUseAmount(tousseName,barcode,idCardUseAmount) {
+		if (sstsConfig.idCardUseAmountNoticeType) {
+			var msg = tousseName + barcode +'已使用' + idCardUseAmount + '次';
+			if (1 == sstsConfig.idCardUseAmountNoticeType) {
+				showMultipleResult(msg, null, sstsConfig.messagePauseTimeOnPackingPage,true);
+			} else if (2 == sstsConfig.idCardUseAmountNoticeType) {
+				speaker.speak(msg);
+			} else if (3 == sstsConfig.idCardUseAmountNoticeType) {
+				showMultipleResult(msg, null, sstsConfig.messagePauseTimeOnPackingPage);
+			}
+		}
+	}
 
+
 	//点击器械包的时候触发事件
 	function itemClickFunction(record, storeId, index) {
 		var tousseName = record.get('tousseName');
@@ -6567,6 +6589,19 @@
 					if (sstsConfig.enablePackingMaterialsCheckFunction) {
 						getPackingMaterialsForCheckFun(record);
 					}
+					if(record.data.haveIDCard == true){
+						if(record.childNodes.length == 0){
+							var tousseName = record.data.tousseName;
+							var useAmount = record.data.useAmount;
+							noticeIdCardUseAmount(tousseName,'',useAmount);
+						}else {
+							for(var i=0;i<record.childNodes.length;i++){
+								var tousseName = record.childNodes[i].data.tousseName;
+								var useAmount = record.childNodes[i].data.useAmount;
+								noticeIdCardUseAmount(tousseName,'',useAmount);
+							}
+						}
+					}
 				}, 200);
 			},
 			load: {
@@ -6786,6 +6821,19 @@
 							getPackingMaterialsForCheckFun(record);
 						}
 					}
+					if(record.data.haveIDCard == true){
+						if(record.childNodes.length == 0){
+							var tousseName = record.data.tousseName;
+							var useAmount = record.data.useAmount;
+							noticeIdCardUseAmount(tousseName,'',useAmount);
+						}else {
+							for(var i=0;i<record.childNodes.length;i++){
+								var tousseName = record.childNodes[i].data.tousseName;
+								var useAmount = record.childNodes[i].data.useAmount;
+								noticeIdCardUseAmount(tousseName,'',useAmount);
+							}
+						}
+					}
 				}, 200);
 			},
 			load: {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37119 -r37201
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37119)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37201)
@@ -1699,16 +1699,15 @@
 }
 
 // 提示标识牌的使用次数
-function noticeIdCardUseAmount(useAmount) {
-	if (sstsConfig && sstsConfig.idCardUseAmountNoticeType) {
-		var msg = '此标识牌已经使用' + useAmount + '次';
+function noticeIdCardUseAmount(msgObj) {
+	if (sstsConfig && sstsConfig.idCardUseAmountNoticeType && msgObj.idCardInstance) {
+		var msg = msgObj.idCardInstance.tousseName + msgObj.idCardInstance.barcode +'已使用' + msgObj.idCardUseAmount + '次';
 		if (1 == sstsConfig.idCardUseAmountNoticeType) {
-			jShowResult(msg);
+			showResultWithoutSpeak(msg);
 		} else if (2 == sstsConfig.idCardUseAmountNoticeType) {
 			speaker.speak(msg);
 		} else if (3 == sstsConfig.idCardUseAmountNoticeType) {
-			speaker.speak(msg);
-			jShowResult(msg);
+			showResult(msg);
 		}
 	}
 }
@@ -3605,7 +3604,7 @@
 					//未补充的丢失报损
 					loadUnSupplementMaterial(msgObj, tmpRow, ti.barcode);
 				}
-				noticeIdCardUseAmount(msgObj.idCardUseAmount);
+				noticeIdCardUseAmount(msgObj);
 				if (msgObj.isTousseNeedMaintain != null && msgObj.isTousseNeedMaintain == true) {
 					alertDiv('\'' + msgObj.tousseInstance.tousseDefinition.name + '\'' + '需要保养了.');
 				}