Merge remote-tracking branch 'origin/master'

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

@@ -281,14 +281,14 @@ public class GraphCalculate {
             manJson.put("detailName", "男");
             manJson.put("value", 1);
             manJson.put("state", 0);
-            if(manJson.get("detailName").equals(sex)){
+            if("M".equals(sex)){
                 manJson.put("state", 1);
             }
             JSONObject womanJson = new JSONObject();
             womanJson.put("detailName", "女");
             womanJson.put("value", 1.018);
             womanJson.put("state", 0);
-            if(womanJson.get("detailName").equals(sex)){
+            if("F".equals(sex)){
                 womanJson.put("state", 1);
             }