Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r39222 -r39231
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 39222)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 39231)
@@ -214,7 +214,7 @@
 }
 
 //ZSWY-246：加载配包注意事项
-function loadLoginUserUnViewedTousseDefinitionNote(ids,isPacking){
+function loadLoginUserUnViewedTousseDefinitionNote(ids,callback){
 	Ext4.Ajax.request({
 		url: WWWROOT + "/disinfectSystem/baseData/tousseDefinitionAction!loadLoginUserUnViewedTousseDefinitionNote.do",
 		method: "post",
@@ -225,25 +225,29 @@
 			if(result.success){
 				if(result.data.length > 1){
 					showAllNoteWindow(result.data);
-					if(isPacking){
+					if(callback){
 						onPackingTousseBtnClickComplete();
-						return false
+						callback(1)
 					}
 				}else if(result.data.length == 1){
 					var tousseName = result.data[0].tousseName;
 					var tousseID = result.data[0].tousseID;
 					showTousseDefinitionNote(tousseName, tousseID)
-					if(isPacking){
+					if(callback){
 						onPackingTousseBtnClickComplete();
-						return false
+						callback(1)
 					}
 				}else {
-					return true
+					if(callback){
+						callback(0)
+					}
 				}
 			}else {
 				showResult(result.message);
-				onPackingTousseBtnClickComplete();
-				return false
+				if(callback){
+					onPackingTousseBtnClickComplete();
+					callback(1)
+				}
 			}
 		}
 	});
@@ -5954,14 +5958,18 @@
 					tousseIDArray.push(tousseID)
 				}
 				if (tousseIDArray.length > 1) {
-					if(loadLoginUserUnViewedTousseDefinitionNote(tousseIDArray.join(';'),true) == false){
-						return
-					}
+					loadLoginUserUnViewedTousseDefinitionNote(tousseIDArray.join(';'),function(res){
+						if(res == 1){
+							return;
+						}
+					})
 				}else if (tousseIDArray.length == 1) {
 					var tousseID = tousseIDArray[0];
-					if(loadLoginUserUnViewedTousseDefinitionNote(tousseID,true) == false){
-						return
-					}
+					loadLoginUserUnViewedTousseDefinitionNote(tousseID,function(res){
+						if(res == 1){
+							return;
+						}
+					})
 				}
 			}
 			var params = [];