新增综合下限，改善下限

src/main/java/com/keymobile/indicators/model/entity/scorecard/IndScorecard.java

@@ -64,4 +64,9 @@ public class IndScorecard {
 
 	private String sectionFormula;//区间公式表达式
 
+
+	private Double compLimitFloorScore;//综合评价下限
+
+	private Double limitFloorScore;//改善提升下限
+
 }

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

@@ -278,6 +278,7 @@ public class IndScorecardService {
 										}
 									}
 										if(StringUtils.isNotBlank(scoreCard.getOtherCalFormula())) {
+											scoreCard.setOtherCalFormula(scoreCard.getOtherCalFormula().replace("F(x)","X"));
 											baseScoreValue = this.getValueFromFormula(
 													scoreCard.getOtherCalFormula(), currentValue,
 													sectionScores,acsType);
@@ -290,6 +291,12 @@ public class IndScorecardService {
 										baseScoreValue = scoreCard.getCompLimitScore();
 									}
 								}
+								//判断是否有设置综合评分分数下限，有的话判断下限分和实际分
+								if(scoreCard.getCompLimitFloorScore()!=null&&scoreCard.getCompLimitFloorScore()!=0){
+									if(baseScoreValue<scoreCard.getCompLimitFloorScore()){
+										baseScoreValue=scoreCard.getCompLimitFloorScore();
+									}
+								}
 							}
 						}
 						//改善提升
@@ -315,11 +322,18 @@ public class IndScorecardService {
 								if(improveBaseScore!=null&&improveBaseScore!=0){
 									improveScore+=improveBaseScore;
 								}
+								//改善上限
 								if(scoreCard.getLimitScore()!=null) {
 									if(improveScore>scoreCard.getLimitScore()) {
 										improveScore =  scoreCard.getLimitScore();
 									}
 								}
+								//改善下限
+								if(scoreCard.getLimitFloorScore()!=null&&scoreCard.getLimitFloorScore()!=0){
+									if(improveScore<scoreCard.getLimitFloorScore()) {
+										improveScore =  scoreCard.getLimitFloorScore();
+									}
+								}
 								indImproveScoreValue = String.format("%.8f",new BigDecimal(improveScore));
 								result.put("improveScore",indImproveScoreValue);
 							}else{
@@ -384,7 +398,7 @@ public class IndScorecardService {
 		double value = Double.parseDouble(valueTmp);
         double returnValue=0;
 		for (String sectionTmp : sections) {
-			 section = sectionTmp.split(",");
+			 section = sectionTmp.split(":");
 			 start= Double.parseDouble(section[0]);
 		     startEq = "1".equals(section[1])?true:false;
 			 end = Double.parseDouble(section[3]);