修改同比提升根据增幅计算类型进行计算排名

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

@@ -444,9 +444,9 @@ public class IndicatorsReportService {
 								&& !"Infinite".equals(currentCalData.getValue())
 								&& StringUtils.isNotBlank(currentCalData.getValue())) {
 							//同比提升单位指本期与同期值相比要好的单位（考虑指标的正反向）
-							rankMap.put(currentCalData.getCompareObj(), 
-									String.valueOf(Double.parseDouble(currentCalData.getValue())-
-											Double.parseDouble(sameCalData.getValue())));
+							rankMap.put(currentCalData.getCompareObj(),CalculateUtils.calGowth(
+									currentCalData.getValue(), sameCalData.getValue(), 
+									driveIndDef.getGrowCalType()));
 							//如果是正向指标
 							if("0".equals(indRule)) {
 								if(Double.parseDouble(currentCalData.getValue())-
@@ -538,7 +538,7 @@ public class IndicatorsReportService {
 				calData.getIndId(), (calData.getDate()-100), calData.getCompareObj());
 		if(sameCalData!=null) {
 			indReportData.setLastSameValue(sameCalData.getValue());
-			indReportData.setLastSameRank(sameCalData.getRank().toString());
+			indReportData.setLastSameRank(sameCalData.getRank()==null ? null : sameCalData.getRank().toString());
 			indReportData.setLastSameScore(sameCalData.getScore());
 			indReportData.setLastSameImprove(sameCalData.getImproveScore());
 			//算同比