Merge remote-tracking branch 'origin/master'

graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -82,14 +82,17 @@ public class GraphCalculate {
                     Integer max_age = Integer.parseInt(sexAgeMap.get("max_age"));
 
                     if(("1".equals(sexType) &&sex.equals(sexType)) || ("2".equals(sexType) &&sex.equals(sexType)) || "3".equals(sexType)){
-                        FeatureRate featureRate = new FeatureRate();
-                        featureRate.setFeatureName(dis);
-                        featureRate.setExtraProperty("");
-                        Map<String, String> value = d.getValue();
-                        String s = JSON.toJSONString(value);
-                        featureRate.setDesc(s);
-                        featureRate.setRate("neo4j");
-                        featureRates.add(featureRate);
+                        if(min_age <age && age<=max_age){
+                            FeatureRate featureRate = new FeatureRate();
+                            featureRate.setFeatureName(dis);
+                            featureRate.setExtraProperty("");
+                            Map<String, String> value = d.getValue();
+                            String s = JSON.toJSONString(value);
+                            featureRate.setDesc(s);
+                            featureRate.setRate("neo4j");
+                            featureRates.add(featureRate);
+                        }
+
                     }
                 }
             }