Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
===================================================================
diff -u -r14156 -r14234
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java	(.../BarcodeTableManager.java)	(revision 14156)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java	(.../BarcodeTableManager.java)	(revision 14234)
@@ -310,32 +310,41 @@
 	 * @return
 	 */
 	public String getBarcodeTypeByBarcode(String barcode){
-		String jsonStr = "{returnType:'barcodeNotFound'}";
+		JSONObject obj = new JSONObject();
+		obj.put("returnType", "");
+		obj.put("message", "barcodeNotFound");
 		if(StringUtils.isNotBlank(barcode)){
 			BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode);
 			if(barcodeDevice !=null){
 				if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_ORGUNIT)){
-					jsonStr = "{returnType:'orgunit'}";
+					obj.put("returnType", "orgunit");
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_USER)){
-					jsonStr = "{returnType:'user'}";
+					obj.put("returnType", "user");
 				}else if(barcodeDevice.getType()!=null && (barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_PACKAGE) 
 						|| barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_SIGNBOARD))){
-					jsonStr = "{returnType:'tousseInstance'}";
+					obj.put("returnType", "tousseInstance");
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_CONTAINER)){
 					Container container = (Container)barcodeDevice;
-					jsonStr = "{returnType:'container',containerType:'"+container.getPurpose()+"',status:'"+container.getStatus()+"'}";
+					obj.put("returnType", "container");
+					obj.put("containerType", container.getPurpose());
+					obj.put("status", container.getStatus());
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_CLEANMETHOD)){
-					jsonStr = "{returnType:'cleanmethod'}";
+					obj.put("returnType", "cleanmethod");
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_RINSER)){
-					jsonStr = "{returnType:'rinser'}";
-				}
-				if(barcodeDevice instanceof IDCardInstance)
+					obj.put("returnType", "rinser");
+				}else if(barcodeDevice instanceof IDCardInstance)
 				{
-					jsonStr = "{returnType:'tousseInstance'}";
+					obj.put("returnType", "tousseInstance");
+				}else{
+					obj.put("message", "条码类型不对,请扫描科室/用户/标识牌/器械包/清洗筐/清洗程序/清洗机条码!");
 				}
+			}else{
+				obj.put("message", String.format("条码%s已不存在!", barcode));
 			}
+		}else{
+			obj.put("message", "条码不能为空!");
 		}
-		return jsonStr;
+		return obj.toString();
 	}
 	
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r14217 -r14234
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 14217)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 14234)
@@ -719,7 +719,7 @@
 														}else if(result.returnType == 'user'){
 															loadUserByBarcode(barcode);
 														}else{
-															showResult('找不到该条码所对应的信息！');
+															showResult(result.message);
 														}
 													}else{
 														showResult('找不到该条码所对应的信息！');