Index: ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RecyclingModule.java
===================================================================
diff -u -r27509 -r27516
--- ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RecyclingModule.java	(.../RecyclingModule.java)	(revision 27509)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RecyclingModule.java	(.../RecyclingModule.java)	(revision 27516)
@@ -9,6 +9,7 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
 
 import test.forgon.disinfectsystem.synthetic.allrecycle.model.RuntimeInfo;
@@ -57,12 +58,13 @@
 		timeoutTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
 			@Override
 			public void runTask() {
-				Map<JSONObject, List<InvoicePlan>> resultMap = invoicePlanManager.getWaitingforRecyclingInvoicePlans(AcegiHelper.getCurrentOrgUnitCode(),
+				Map<String, Object> resultMap = invoicePlanManager.getWaitingforRecyclingInvoicePlans(AcegiHelper.getCurrentOrgUnitCode(),
 						null, null, null, null, null, null,false, 0, 1000);
-				List<InvoicePlan> list = new ArrayList<InvoicePlan>();;
-				for (Entry<JSONObject, List<InvoicePlan>> entry : resultMap.entrySet()) {
-					list = entry.getValue();
-					break;
+				List<InvoicePlan> list = new ArrayList<InvoicePlan>();
+				List<InvoicePlan> invoicePlanList = new ArrayList<InvoicePlan>();
+				JSONObject obj = new JSONObject();
+				if(MapUtils.isNotEmpty(resultMap)){
+					list = (List<InvoicePlan>)resultMap.get("invoicePlanList");
 				}
 				waitRecyclingApplicationIds = list.stream().map(p->p.getId()).collect(Collectors.toList());
 			}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r27509 -r27516
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 27509)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 27516)
@@ -113,7 +113,7 @@
 	 * @param pageSize 每页条数
 	 * return key:JSONObject{invoicePlanAmount(申请单总数):150,departAmount(总科室数量):5} value:List<InvoicePlan>申请单列表,因为put到JSONObject会报错,所以用map保存
 	 */
-	public Map<JSONObject, List<InvoicePlan>> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,
+	public Map<String, Object> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,
 			String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId, String groupId, Boolean isQuerySum, Integer pageIndex, Integer pageSize);
 
 	public List<ApplicationItemVO> findApplicationItemVOListByInvoicePlanId(
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r27509 -r27516
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 27509)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 27516)
@@ -15,7 +15,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpSession;
@@ -26,6 +25,7 @@
 import net.sf.json.util.CycleDetectionStrategy;
 import net.sf.json.util.PropertyFilter;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.map.HashedMap;
@@ -1259,17 +1259,15 @@
 		if(pageIndex.intValue() == 1){
 			isQuerySum = true;
 		}
-		Map<JSONObject, List<InvoicePlan>> resultMap = invoicePlanManager
+		Map<String, Object> resultMap = invoicePlanManager
 				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding,appType,applyTimeOrder,operationRoom,
 						tousseGroupId,groupId,isQuerySum,pageIndex,pageSize);
 		List<InvoicePlan> invoicePlanList = new ArrayList<InvoicePlan>();
 		JSONObject obj = new JSONObject();
-		for (Entry<JSONObject, List<InvoicePlan>> entry : resultMap.entrySet()) {
-			obj = entry.getKey();
-			invoicePlanList = entry.getValue();
-			obj.put("invoicePlanAmount", obj.optLong("invoicePlanAmount"));
-			obj.put("departAmount", obj.optLong("departAmount"));
-			break;
+		if(MapUtils.isNotEmpty(resultMap)){
+			obj.put("invoicePlanAmount", resultMap.get("invoicePlanAmount"));
+			obj.put("departAmount", resultMap.get("departAmount"));
+			invoicePlanList = (List<InvoicePlan>)resultMap.get("invoicePlanList");
 		}
 		List<InvoicePlan> disinfectApp = new ArrayList<InvoicePlan>();
 		JSONArray jsonArray = new JSONArray();
@@ -1285,7 +1283,6 @@
 				}else{
 					buildJsonItem(jsonArray, ip);
 				}
-				buildJsonItem(jsonArray, ip);
 			}
 		}
 		//消毒物品申请单排在最后
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r27514 -r27516
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27514)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27516)
@@ -27,7 +27,6 @@
 import org.apache.commons.collections4.PredicateUtils;
 import org.apache.commons.collections4.Transformer;
 import org.apache.commons.collections4.functors.NotNullPredicate;
-import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -76,8 +75,6 @@
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
-import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
-import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
@@ -117,7 +114,6 @@
 import com.forgon.tools.GB2WB;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.SqlBuilder;
-import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
@@ -1413,7 +1409,7 @@
 	}
 	
 	@Override
-	public Map<JSONObject, List<InvoicePlan>> getWaitingforRecyclingInvoicePlans(
+	public Map<String, Object> getWaitingforRecyclingInvoicePlans(
 			String handleDepartCoding, String applicationOrgUnitCoding,
 			String applicationType, String applyTimeOrder,String operationRoom,
 			String tousseGroupId, String groupId, Boolean isQuerySum, Integer pageIndex, Integer pageSize) {
@@ -1487,27 +1483,26 @@
 		}else{
 			orderBySql = " order by "+ extraOrder +" po.applicationTime " + applyTimeOrder ;
 		}
-		JSONObject obj = new JSONObject();
-		Map<JSONObject, List<InvoicePlan>> map = new HashMap<JSONObject, List<InvoicePlan>>();
+		Map<String, Object> map = new HashMap<String, Object>();
 		if(isQuerySum){
-			getDepartAmountAndInvoicePlanAmount("select count(*) invoicePlanAmount,count(distinct po.depart) departAmount from InvoicePlan po " + whereSql.replaceAll("invoicePlan.id", "recyclingApplication_ID"),obj);
+			getDepartAmountAndInvoicePlanAmount("select count(*) invoicePlanAmount,count(distinct po.depart) departAmount from InvoicePlan po " + whereSql.replaceAll("invoicePlan.id", "recyclingApplication_ID"),map);
 		}
 		List<InvoicePlan> list = objectDao.findByHql(queryColumnSql + whereSql + orderBySql, (pageIndex - 1) * pageSize, pageSize);
-		map.put(obj, list);
+		map.put("invoicePlanList", list);
 		return map;
 	}
 	/**
 	 * 查询符合条件的总申请单数和总科室数
 	 */
-	private void getDepartAmountAndInvoicePlanAmount(String sql, JSONObject obj){
+	private void getDepartAmountAndInvoicePlanAmount(String sql, Map<String, Object> map){
 		ResultSet rs = null;
 		try {
 			rs = objectDao.executeSql(sql);
 			if (rs.next()) {
 				Long invoicePlanAmount = rs.getLong("invoicePlanAmount");
 				Long departAmount = rs.getLong("departAmount");
-				obj.put("invoicePlanAmount", invoicePlanAmount);
-				obj.put("departAmount", departAmount);
+				map.put("invoicePlanAmount", invoicePlanAmount);
+				map.put("departAmount", departAmount);
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();