Merge remote-tracking branch 'origin/master'

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

@@ -78,7 +78,7 @@ public class GraphCalculate {
                 Map<String, String> sexAgeMap = sexAgeCache.get(dis);
                 if(sexAgeMap != null){
                     String sexType = sexAgeMap.get("sexType");
-                    if(sex.equals(sexType)){
+                    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("");