Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r16262 -r16407
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 16262)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 16407)
@@ -83,15 +83,20 @@
 										params : {basketBarcode : basketBarcode,tousseBarcode : addBarcode,taskGroup : $Id('parm_s_taskGroup').value},
 										success : function(response, options) {
 											var result = Ext.decode(response.responseText);
-											showResult(result.msg);
+											showResult(result.message);
 											if(result.success == true){
 												basketTousseInstanceStore.load();
 												top.Ext.getCmp('addBarcode').setValue('');
 											}
 										},
 										failure : function(response, options) {
 											var result = Ext.decode(response.responseText);
-											showResult(result.cause);
+											if(result && result.message){
+												showResult(result.message);
+											}else{
+												showResult('连接服务器失败');
+											}
+											
 										}
 									});
 								}
@@ -115,15 +120,19 @@
 							params : {basketBarcode : basketBarcode,tousseBarcode : addBarcode,taskGroup : $Id('parm_s_taskGroup').value},
 							success : function(response, options) {
 								var result = Ext.decode(response.responseText);
-								showResult(result.msg);
+								showResult(result.message);
 								if(result.success == true){
 									basketTousseInstanceStore.load();
 									top.Ext.getCmp('addBarcode').setValue('');
 								}
 							},
-							failure : function(response, options) {
+							failure : function(response, options) {								
 								var result = Ext.decode(response.responseText);
-								showResult(result.cause);
+								if(result && result.message){
+									showResult(result.message);
+								}else{
+									showResult('连接服务器失败');
+								}
 							}
 						});
 					}
@@ -174,9 +183,15 @@
 	var rows = Ext.getCmp('forReviewGrid').getSelectionModel().getSelections();// 返回值为
 	var gridStore =  Ext.getCmp('forReviewGrid').getStore();
 	if (rows) {
+		var deleteItems = [];
 		for ( var i = 0; i < rows.length; i++) {
+			var deleteItem = {};
+			deleteItem.barcode=rows[i].data.barcode;
+			deleteItem.tousseName=rows[i].data.tousseDefinitionName;
+			deleteItems.push(deleteItem);
 			gridStore.remove(rows[i]);
 		}
+		addDataBaseLog('D',"删除对象:" + JSON.stringify(deleteItems));
 	}
 	onScannedTousseAmountChanged();
 }
@@ -236,26 +251,6 @@
 	return '';
 }
 
-function loadUserByBarcode(peopleOfBarcode){
-	var found = false;
-	if(peopleOfBarcode){
-		UserTableManager.getUserByBarcode(peopleOfBarcode,function(responseText){
-			if(responseText != null && responseText != ""){
-			    var result = Ext.decode(responseText);
-			    if(result.success){
-			    	Ext.getCmp('reviewer').setValue(result.fullName);
-					Ext.getCmp('reviewerCode').setValue(result.name);
-					speaker.speak(result.fullName);
-			    	found = true;
-			    } else {  //（cjr）
-			    	result.isNotSameOrgUnit?showResult("不允许登记非本科室人员，请扫描本科室人员条码"):showResult("找不到该包或篮筐或人员信息。");
-			    }
-			}
-		});
-	}
-	return found;
-}
-
 function moveTousse(){
 	
 	var records = grid.getSelectionModel().getSelections();
@@ -464,6 +459,7 @@
 }
 function addTousse(records){
 	var speakBasket = new SpeakBasket();
+	var logItems = [];
 	for ( var i = 0;i<records.length;i++) {
 		var tousseId = records[i].data.id;
 		var tousseName = records[i].data['tousseDefinition.name'];
@@ -490,14 +486,21 @@
 			    packageType: packageType,
 			    virtualBasketSeqNum:virtualBasketSeqNum
 			});
-			Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance);
-			speakBasket.addGoods('',tousseName,1);
+		Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance);
+		speakBasket.addGoods('',tousseName,1);
+		logItems.push({tousseId:tousseId,tousseName:tousseName,barcode:barcode});
 //			grid.getStore().remove(records[i]);
-		}
+	}
+	addDataBaseLog("A","进入审核列表:" + JSON.stringify(logItems))
 	speakBasket.speakContent();	
 	onScannedTousseAmountChanged();
 }
-
+function addDataBaseLog(type,description){
+	Ext.Ajax.request({
+		url :  WWWROOT + '/log/saveLog.do',
+		params : {model : '审核模块',type : type,description : description}
+	});
+}
 function clearScanText(){
 	var barcodeEnd = Ext.getCmp("barcodeEnd").getValue().Trim();
 //	if(barcodeEnd == '')
@@ -610,9 +613,9 @@
 							if(waitingBox.isVisible()){
 								waitingBox.hide();
 							}
-							showResult("审核成功！");
 
 							var result = Ext.decode(response.responseText);
+							showResult(result.message);
 							if (result.success){
 								// 审核时打印标签
 								if (sstsConfig.printLabelWhenReviewing == true){
@@ -638,7 +641,12 @@
 								waitingBox.hide();
 							}
 							var result = Ext.decode(response.responseText);
-							showResult(result);
+							if(result && result.message){
+								showResult(result.message);
+							}else{
+								showResult("连接失败");
+							}
+							
 						}
 					});
 					}
@@ -1214,18 +1222,21 @@
 							if(isExist==-1){
 								var barcode = Ext.getCmp('barcode').getValue();
 								clearScanText();
-								ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode,function(jsonStr){
+								ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode,"审核",function(jsonStr){
 									var obj = Ext.util.JSON.decode(jsonStr);
 									var returnType = obj.returnType;
 									var containerType = obj.containerType;
-									if(returnType=="basketNotFound"){//条码不存在
-										DWREngine.setAsync(false);
-										if(!loadUserByBarcode(barcode)){
-											Ext.getCmp('barcode').setValue('');
+									if(returnType=="User"){
+										if(obj.success){
+											Ext.getCmp('reviewer').setValue(obj.fullName);
+											Ext.getCmp('reviewerCode').setValue(obj.name);
+											speaker.speak(obj.fullName);
 										}else{
-											Ext.getCmp('barcode').setValue('');
+											showResult(obj.message);
 										}
-										DWREngine.setAsync(true);
+										Ext.getCmp('barcode').setValue('');
+									}else if(returnType=="basketNotFound"){//条码不存在
+										showResult("找不到该包或篮筐或人员信息。")
 									} else if (returnType == "basketUsed") {
 										showResult("无法录入篮筐，篮筐正处于[" + obj.status + "]状态");
 										clearBarcodeAndBasketName();
@@ -1357,7 +1368,7 @@
 							}
 							var barcode = Ext.getCmp('barcode').getValue();
 							var barcodeEnd = Ext.getCmp('barcodeEnd').getValue();
-							ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd,function(jsonStr){
+							ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd,"审核",function(jsonStr){
 								var obj = Ext.util.JSON.decode(jsonStr);
 								var returnType = obj.returnType;
 								var containerType = obj.containerType;
@@ -1498,6 +1509,7 @@
 		//如果审核界面的审核人是否默认为上一次审核的审核人配置为false,则审核完后需要重新清空
         if(reviewPageReviewerDefaultLastReviewer == false){
         	Ext.getCmp('reviewer').setValue('');
+        	Ext.getCmp('reviewerCode').setValue('');
         }
 	}