Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12748 -r12750
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12748)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12750)
@@ -570,27 +570,27 @@
 
 		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
 		double floatPercent = config.getDiposablePriceFluctuation();// 一次性物品浮动价格系数/
-		JSONArray jArray = new JSONArray(); 
+		List<Map<String,Object>> mapList = new ArrayList<Map<String,Object>>(); 
 		for (DisposableGoods disposableGoods : disposableGoodsList) {
 			DisposableGoodsStock goodsStock = disposableGoodsStockManager.getDisposableGoodsStockByDisposableGoodsId(
 					disposableGoods.getId() + "",wareHouseId);
-			JSONObject item = buildDisposableGoodsJSONObject(disposableGoods,goodsStock,floatPercent,
+			Map<String,Object> item = buildDisposableGoodsPropertyMap(disposableGoods,goodsStock,floatPercent,
 					true);
 			if(item != null){
-				jArray.add(item);
+				mapList.add(item);
 			}
 		}
-		JSONObject json = new JSONObject();
-		json.put("totalCount", jArray.size());
-		json.put("data",jArray);	
-		return json;
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("totalCount", mapList.size());
+		map.put("data", mapList);
+		return JSONObject.fromObject(map);
 	}
 
-	private JSONObject buildDisposableGoodsJSONObject(DisposableGoods disposableGoods,
+	private Map<String,Object> buildDisposableGoodsPropertyMap(DisposableGoods disposableGoods,
 			DisposableGoodsStock goodsStock,double floatPercent,boolean showReferencePrice) {
 		if(disposableGoods == null)
 			return null;
-		JSONObject temp = new JSONObject();
+		Map<String,Object> temp = new HashMap<String,Object>();
 		
 		String goodsName = DisposableGoodsUtils.getDisposableGoodsFullName(disposableGoods.getName(), 
 				disposableGoods.getSpecification()) ;