修改报表1填入改善提升值逻辑以及地区评分表的set入机构编码code

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

@@ -393,6 +393,7 @@ public class ScoreRuleService {
 					if(objScoreCalResult == null) {
 						objScoreCalResult = new ObjScoreCalResult();
 					}
+					objScoreCalResult.setCode(code);
 					//计算类型：0  地区所有纳入评价的考核指标平均数 
 					if("0".equals(scoreRule.getCalType())) {
 						objScoreCalResult = this.calGroupIndAverageOrSum(objScoreCalResult, scoreRule, 

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

@@ -892,7 +892,8 @@ public class IndicatorsReportService {
 		if(StringUtils.isNotBlank(calData.getScore())) {
 			indReportData.setCurrentScore(new BigDecimal(calData.getScore()));
 		}
-		if(StringUtils.isNotBlank(calData.getImproveScore())) {
+		if(StringUtils.isNotBlank(calData.getImproveScore()) 
+				&& !"No".equals(calData.getImproveScore())) {
 			indReportData.setCurrentImprove(new BigDecimal(calData.getImproveScore()));
 		}
 		//查找同期结果