修改获取前三末三bug

src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java

@@ -309,9 +309,17 @@ public class IndicatorsReportService {
 			for(DriveIndCalResultDef calData : calDatas) {
 				compareObjMapper.put(calData.getCompareObj(),calData.getCompareObjDesc());
 			}
-			//标杆单位
-			indReportData.setBestUnit(calDatas.get(0).getCompareObj());
-			indReportData.setBestUnitDesc(calDatas.get(0).getCompareObjDesc());
+			//标杆单位(多个并列第一都要列出来)
+			StringBuilder bestUnits = new StringBuilder("");
+			StringBuilder bestUnitsDesc = new StringBuilder("");
+			for(DriveIndCalResultDef calData : calDatas) {
+				if(calData.getRank()==1) {
+					bestUnits.append(calData.getCompareObj()).append(";");
+					bestUnitsDesc.append(calData.getCompareObjDesc()).append(";");
+				}
+			}
+			indReportData.setBestUnit(bestUnits.toString());
+			indReportData.setBestUnitDesc(bestUnitsDesc.toString());
 			//标杆值
 			indReportData.setBestUnitValue(calDatas.get(0).getValue());
 			//优于平均数单位数

src/main/java/com/keymobile/indicators/utils/CalculateUtils.java

@@ -69,7 +69,7 @@ public class CalculateUtils {
 		//将map中的无效值挑出来
 		for(Entry<String,String> entry : valueMap.entrySet()) {
 			if("NaN".equals(entry.getValue())|| "Infinite".equals(entry.getValue())
-					|| "0.0000".equals(entry.getValue()) /*|| "0".equals(entry.getValue())*/
+					/*|| "0.0000".equals(entry.getValue()) || "0".equals(entry.getValue())*/
 					|| "".equals(entry.getValue())) {
 				invalidMap.put(entry.getKey(),entry.getValue());
 			}else {
@@ -211,10 +211,9 @@ public class CalculateUtils {
 			rankClassifyMap.put(map.getValue(), rankClassifyList);
 		}
 		if(!rankClassifyMap.isEmpty()) {
-			if(rankClassifyMap.get(1)!=null) {
-				if(rankClassifyMap.get(1).size()>3) {
-					rankNum = rankClassifyMap.get(1).size();
-				}
+			List<String> firstKeyValue = rankClassifyMap.values().iterator().next();
+			if(firstKeyValue!=null && firstKeyValue.size()>3) {
+				rankNum = firstKeyValue.size();
 			}
 		}
 		Map<String,Integer> resultRankMap = new LinkedHashMap<>();