diff --git a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
index 47f0450..c4cc4a4 100644
--- a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
+++ b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.collections.functors.AllPredicate;
 import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -416,22 +417,27 @@ public class DataGeneralizeController {
 	@ApiOperation(value="获取停车场设备和PDA在线离线总数")
 	@PostMapping("queryParkEqpAndPDACount")
 	@ResponseBody
-	public BizResultVO<Map<String,ParkEqpAndPDACountDTO>> queryParkEqpAndPDACount(@RequestBody QueryParkEqpAndPDACountRequest request){
+	public BizResultVO<ParkEqpAndPDACountDTO> queryParkEqpAndPDACount(@RequestBody QueryParkEqpAndPDACountRequest request){
 		if(null == request.getEqpType() || null == request.getPdaType() || CollectionUtils.isEmpty(request.getPlNos())){
 			throw new BizException(ErrorType.PARAMM_NULL, "入参不能为空");
 		}
 		logger.info("调用dubbo服务,请求入参: request={}", JSONObject.toJSONString(request));
-		Map<String,ParkEqpAndPDACountDTO> parkEqpAndPDACountMap = Maps.newHashMap();
+		ParkEqpAndPDACountDTO parkEqpAndPDACountDTO=new ParkEqpAndPDACountDTO();
 		//查询停车场设备
 		BizResult<List<ParkEqpAndPDACountDTO>> result = parkingLotEqpService.queryParkEqpCountByPlNosAndEqpType(request);
 		logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(result));
 		List<ParkEqpAndPDACountDTO> parkEqpList=result.getData();
 		//PDA
+		int onlineEqpCountSum=0;
+		int allEqpCountSum=0;
+		int onlinePDACountSum=0;
+		int allPDACountSum=0;
+		
 		if(CollectionUtils.isNotEmpty(parkEqpList)){
 			for (ParkEqpAndPDACountDTO dto : parkEqpList) {
 				if(null != dto){
-					String plNo = StringUtils.isEmpty(dto.getPlNo())?"":dto.getPlNo();
-					parkEqpAndPDACountMap.put(plNo, dto);
+					onlineEqpCountSum=onlineEqpCountSum+(null==dto.getOnlineEqpCount()?0:dto.getOnlineEqpCount());
+					allEqpCountSum=allEqpCountSum+(null==dto.getAllEqpCount()?0:dto.getAllEqpCount());
 				}
 			}
 		}
@@ -444,22 +450,17 @@ public class DataGeneralizeController {
         if(CollectionUtils.isNotEmpty(parkPDACountList)){
         	for (ParkEqpAndPDACountDTO dto : parkPDACountList) {
         		if(null != dto){
-					String plNo = StringUtils.isEmpty(dto.getPlNo())?"":dto.getPlNo();
-					if(parkEqpAndPDACountMap.containsKey(plNo)){
-						parkEqpAndPDACountMap.get(plNo).setOnlinePDACount(null==dto.getOnlinePDACount()?0:dto.getOnlinePDACount());
-						parkEqpAndPDACountMap.get(plNo).setAllPDACount(null==dto.getAllPDACount()?0:dto.getAllPDACount());
-					}else{
-						parkEqpAndPDACountMap.put(plNo, dto);
-					}
+        			onlinePDACountSum=onlinePDACountSum+(null==dto.getOnlinePDACount()?0:dto.getOnlinePDACount());
+        			allPDACountSum=allPDACountSum+(null==dto.getAllPDACount()?0:dto.getAllPDACount());
 				}
 			}
         }
-        for (String plNo : request.getPlNos()) {
-        	if(!parkEqpAndPDACountMap.containsKey(plNo)){
-        		parkEqpAndPDACountMap.put(plNo, new ParkEqpAndPDACountDTO());
-        	}
-		}
+        parkEqpAndPDACountDTO.setAllEqpCount(allEqpCountSum);
+        parkEqpAndPDACountDTO.setAllPDACount(allPDACountSum);
+        parkEqpAndPDACountDTO.setOnlineEqpCount(onlineEqpCountSum);
+        parkEqpAndPDACountDTO.setOnlinePDACount(onlinePDACountSum);
+        
         
-		return new BizResultVO<Map<String,ParkEqpAndPDACountDTO>>().setData(parkEqpAndPDACountMap);
+		return new BizResultVO<ParkEqpAndPDACountDTO>().setData(parkEqpAndPDACountDTO);
 	}
 }