Merge branch 'hy-tobacco' of http://132.232.112.242:7090/zhangkb/indicators into hy-tobacco

src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java

@@ -198,9 +198,9 @@ public class IndScorecardService {
 									}
 								}else {//公式
 									int rank = currentCompareObjResult.getRank();//获取排位
-									if(rank==1) {//最佳指标
+									if(rank==1 && scoreCard.getBestIndScore()!=null) {//最佳指标
 										baseScoreValue = scoreCard.getBestIndScore();
-									}else if(rank==currentDriveResultSize) {//最差指标
+									}else if(rank==currentDriveResultSize && scoreCard.getWorstIndScore()!=null) {//最差指标
 										baseScoreValue = scoreCard.getWorstIndScore();
 									}else {//其他
 										if(StringUtils.isNotBlank(scoreCard.getOtherCalFormula())) {