|
@@ -583,8 +583,15 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
|
//累计分数
|
|
|
if(d.getOptionCode().equals("DF")||d.getOptionCode().equals("DF2")||d.getOptionCode().equals("JHDF")){
|
|
|
score = score + resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getQuantifiedValue();
|
|
|
- minScore =resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMinScore();
|
|
|
- maxScore =resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMaxScore();
|
|
|
+
|
|
|
+ //判断最大最小值 ;是否存在值
|
|
|
+ if(null != resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMinScore()){
|
|
|
+ minScore =resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMinScore();
|
|
|
+ }
|
|
|
+ if(null != resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMaxScore()){
|
|
|
+ maxScore =resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getMaxScore();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|