防止值为null

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

@@ -241,13 +241,14 @@ public class ShortboardRuleService {
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
 							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						//判断有没有实际的平均值
-						if(!"0.0".equals(calResult.getActualAverage())) {
+
+						if(calResult.getActualAverage()!=null&&!"0.0".equals(calResult.getActualAverage())) {
 							if(Double.parseDouble(calResult.getValue()) >
 								Double.parseDouble(calResult.getActualAverage())) {
 								filterCalResults.add(calResult);
 							}
 						}else {//没有比较组内平均值
-							if(Double.parseDouble(calResult.getValue()) > 
+							if(calResult.getValue()!=null&&calResult.getAverage()!=null&&Double.parseDouble(calResult.getValue()) >
 								Double.parseDouble(calResult.getAverage())) {
 								filterCalResults.add(calResult);
 							}
@@ -257,13 +258,13 @@ public class ShortboardRuleService {
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
 							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						//判断有没有实际的平均值
-						if(!"0.0".equals(calResult.getActualAverage())) {
+						if(calResult.getActualAverage()!=null&&!"0.0".equals(calResult.getActualAverage())) {
 							if(Double.parseDouble(calResult.getValue()) < 
 								Double.parseDouble(calResult.getActualAverage())) {
 								filterCalResults.add(calResult);
 							}
 						}else {//没有比较组内平均值
-							if(Double.parseDouble(calResult.getValue()) < 
+							if(calResult.getValue()!=null&&calResult.getAverage()!=null&&Double.parseDouble(calResult.getValue()) <
 								Double.parseDouble(calResult.getAverage())) {
 								filterCalResults.add(calResult);
 							}
@@ -276,7 +277,7 @@ public class ShortboardRuleService {
 				//判断是比较差还是百分比
 				if("0".equals(shortboardItem.getAnalysisType())) {//绝对值
 					//判断有没有实际的平均值
-					if(!"0.0".equals(filterCalResult.getActualAverage())) {
+					if(filterCalResult.getValue()!=null&&filterCalResult.getActualAverage()!=null&&!"0.0".equals(filterCalResult.getActualAverage())) {
 						//获取差值绝对值
 						Double differ = Math.abs(Double.parseDouble(filterCalResult.getActualAverage())
 								-Double.parseDouble(filterCalResult.getValue()));
@@ -285,15 +286,18 @@ public class ShortboardRuleService {
 						}
 					}else {
 						//获取差值绝对值
-						Double differ = Math.abs(Double.parseDouble(filterCalResult.getAverage())
-								-Double.parseDouble(filterCalResult.getValue()));
-						if(differ > Double.parseDouble(shortboardItem.getValue())) {
-							realCalResults.add(filterCalResult);
+						if(filterCalResult.getAverage()!=null&&filterCalResult.getValue()!=null){
+							Double differ = Math.abs(Double.parseDouble(filterCalResult.getAverage())
+									-Double.parseDouble(filterCalResult.getValue()));
+							if(differ > Double.parseDouble(shortboardItem.getValue())) {
+								realCalResults.add(filterCalResult);
+							}
 						}
+
 					}
 				}else {//百分比
 					//判断有没有实际的平均值
-					if(!"0.0".equals(filterCalResult.getActualAverage())) {
+					if(filterCalResult.getActualAverage()!=null&&!"0.0".equals(filterCalResult.getActualAverage())) {
 						Double percentage = Math.abs(Double.parseDouble(CalculateUtils.calGowth( 
 								filterCalResult.getValue(), filterCalResult.getActualAverage(), 
 								driveIndDef.getGrowCalType())));