Index: ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js
===================================================================
diff -u -r18500 -r20773
--- ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js	(.../recycle.js)	(revision 18500)
+++ ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js	(.../recycle.js)	(revision 20773)
@@ -1762,13 +1762,17 @@
 					});
 				}
 			}else if(result != null && result != "null" && !result.success){
-				showResult(result.msg);
+				showResult(result.message);
 			}
 			Ext.getCmp("scanBarcode").setValue('');
 		},
 		failure : function(response, options) {
 			var result = Ext.decode(response.responseText);
-			showResult(result.msg);
+			if(result && result.message){
+				showResult(result.message);
+			}else{
+				showResult('获取器械包失败');
+			}
 		}
 	});
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r20399 -r20773
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20399)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20773)
@@ -1632,36 +1632,23 @@
 
 	public void loadTousseInstanceInfo() {
 		String barcode = StrutsParamUtils.getPraramValue("barcode", "");
-		String message = null;
+		JSONObject json = null;
 		if (StringUtils.isNotBlank(barcode)) {
 			BarcodeDevice barcodeDevice = barcodeManager
 					.getBarcodeByBarcode(barcode);
-			if (barcodeDevice != null
-					&& barcodeDevice instanceof TousseInstance) {
+			if (barcodeDevice instanceof TousseInstance) {
 				TousseInstance tousseInstance = (TousseInstance) barcodeDevice;
-				if (TousseInstance.STATUS_USED.equals(tousseInstance
-						.getStatus())
-						|| TousseInstance.STATUS_SHIPPED.equals(tousseInstance
-								.getStatus())
-						|| TousseInstance.STATUS_DISINFECTED
-								.equals(tousseInstance.getStatus())) {
-					message = "{success:true,tousseName:'"
-							+ tousseInstance.getTousseDefinitionName()
-							+ "',barcode:'"
-							+ tousseInstance.getBarcode()
-							+ "',depart:'"
-							+ tousseInstance.getLocationForDisplay()
-							+ "',isCleanedEntirely:'"
-							+ tousseInstance.getTousseDefinition()
-									.getIsCleanedEntirely()
-							+ "',tousseType:'"
-							+ tousseInstance.getTousseDefinition()
-									.getTousseType() + "'}";
+				if (tousseInstance.isUsed() || tousseInstance.isShipped() || tousseInstance.isDisinfected()) {
+					json = JSONUtil.buildJsonObject(true);
+					json.put("tousseName", tousseInstance.getTousseDefinitionName());
+					json.put("barcode", tousseInstance.getBarcode());
+					json.put("depart", tousseInstance.getLocationForDisplay());
+					json.put("isCleanedEntirely", tousseInstance.getTousseDefinition().getIsCleanedEntirely());
+					json.put("tousseType", tousseInstance.getTousseDefinition().getTousseType());
 				} else {
-					message = "{success:false,msg:'该器械包还未发出，不能进行回收。'}";
+					json = JSONUtil.buildJsonObject(false, "该器械包还未发出，不能进行回收。");
 				}
-			} else if (barcodeDevice != null
-					&& barcodeDevice instanceof IDCardInstance) {
+			} else if (barcodeDevice instanceof IDCardInstance) {
 				List<TousseInstance> tousseInstances = ((IDCardInstance) barcodeDevice)
 						.getTousseInstances(objectDao);
 				if (tousseInstances != null && tousseInstances.size() > 0) {
@@ -1675,62 +1662,45 @@
 								}
 
 							});
-					if (TousseInstance.STATUS_SHIPPED.equals(tousseInstances
-							.get(0).getStatus())
-							|| TousseInstance.STATUS_USED
-									.equals(tousseInstances.get(0).getStatus())) {
-						TousseInstance tousseInstance = tousseInstances.get(0);
-						message = "{success:true,tousseName:'"
-								+ tousseInstance.getTousseDefinitionName()
-								+ "',barcode:'"
-								+ tousseInstance.getBarcode()
-								+ "',depart:'"
-								+ tousseInstance.getLocationForDisplay()
-								+ "',isCleanedEntirely:'"
-								+ tousseInstance.getTousseDefinition()
-										.getIsCleanedEntirely()
-								+ "',tousseType:'"
-								+ tousseInstance.getTousseDefinition()
-										.getTousseType() + "'}";
+					TousseInstance tousseInstance = tousseInstances.get(0);
+					if (tousseInstance.isShipped() || tousseInstance.isUsed()) {
+						json = JSONUtil.buildJsonObject(true);
+						json.put("tousseName", tousseInstance.getTousseDefinitionName());
+						json.put("barcode", tousseInstance.getBarcode());
+						json.put("depart", tousseInstance.getLocationForDisplay());
+						json.put("isCleanedEntirely", tousseInstance.getTousseDefinition().getIsCleanedEntirely());
+						json.put("tousseType", tousseInstance.getTousseDefinition().getTousseType());
 					} else {
 						IDCardInstance idCardInstance = ((IDCardInstance) barcodeDevice);
 						TousseDefinition tousseDefinition = tousseDefinitionManager
 								.getTousseDefinitionByIDCardInstance(idCardInstance);
-						message = "{success:true,tousseName:'"
-								+ tousseDefinition.getName() + "',barcode:'"
-								+ idCardInstance.getBarcode()
-								+ "',depart:'新器械包标识牌',isCleanedEntirely:'"
-								+ tousseDefinition.getIsCleanedEntirely()
-								+ "',tousseType:'"
-								+ tousseDefinition.getTousseType() + "'}";
+						json = JSONUtil.buildJsonObject(true);
+						json.put("tousseName", tousseDefinition.getName());
+						json.put("barcode", idCardInstance.getBarcode());
+						json.put("depart", "新器械包标识牌");
+						json.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
+						json.put("tousseType", tousseDefinition.getTousseType());
 					}
 				} else {
 					try {
 						IDCardInstance idCardInstance = ((IDCardInstance) barcodeDevice);
 						TousseDefinition tousseDefinition = tousseDefinitionManager
 								.getTousseDefinitionByIDCardInstance(idCardInstance);
-						message = "{success:true,tousseName:'"
-								+ tousseDefinition.getName() + "',barcode:'"
-								+ idCardInstance.getBarcode()
-								+ "',depart:'新器械包标识牌',isCleanedEntirely:'"
-								+ tousseDefinition.getIsCleanedEntirely()
-								+ "',tousseType:'"
-								+ tousseDefinition.getTousseType() + "'}";
+						json = JSONUtil.buildJsonObject(true);
+						json.put("tousseName", tousseDefinition.getName());
+						json.put("barcode", idCardInstance.getBarcode());
+						json.put("depart", "新器械包标识牌");
+						json.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
+						json.put("tousseType", tousseDefinition.getTousseType());
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
 				}
 			} else {
-				message = "{success:false,msg:'没有找到该条码对应的器械包。'}";
+				json = JSONUtil.buildJsonObject(false, "没有找到该条码对应的器械包。");
 			}
-
 		}
-		try {
-			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
-			StrutsParamUtils.getResponse().getWriter().println(message);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		StrutsResponseUtils.output(json);
 	}
 
 	public void amendDisinfectionTousseItems() {