jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 6 additions and 15 deletions

...	...	@@ -789,7 +789,7 @@
789	789	}
790	790	score+=NumberUtils.toInt(map.get("score").toString());
791	791
792		- highScoreResult.getLevel().add(map.get("fyyse"));
	792	+ highScoreResult.getLevel().add(map);
793	793	}
794	794	if(StringUtils.isNotEmpty(otherRisk.toString())){
795	795	highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
...	...	@@ -844,8 +844,7 @@
844	844	}
845	845	score+=NumberUtils.toInt(map.get("score").toString(),0);
846	846
847		-// highScoreResult.getLevel().add(map);
848		- highScoreResult.getLevel().add(map.get("fyyse"));
	847	+ highScoreResult.getLevel().add(map);
849	848	}
850	849	highScoreResult.setScore(highScoreResult.getScore()+score);
851	850	if(StringUtils.isNotEmpty(otherRisk.toString())){

...	...	@@ -428,18 +428,10 @@
428	428
429	429
430	430	public static void main(String[] str) {
431		-// String ssss = "{\"qztp\":true,\"yesOrNo\":\"no\",\"tpzb\":true,\"zxqqz\":true,\"zxqqq\":true,\"tpzl\":true," +
432		-// "\"zxmxgxybfzxqq\":true,\"chcx\":true,\"rshbmxgxy\":true,\"tmzp\":true,\"rsqgxy\":true,\"qt\":false,\"qtText\":\"11\"}";
433		-//
434		-// Map m = JsonUtil.str2Obj(ssss,Map.class);
435		-//
436		-// String a = replace(m);
437		-// System.out.print("哈哈.................... " + a);
438		-
439		-// String s = "{\"qt\":true,\"jsjmj\":true,\"ydqjd\":\"5769ef930cf2d37f03479390\",\"qtText\":\"其他\",\"yesOrNO\":\"yes\",\"dc\":true}";
440		-// Map m = JsonUtil.str2Obj(s,Map.class);
441		-// String a = replaceYDFMW(m,1);
442		-
	431	+ List<Map<String, Object>> listMap = new ArrayList<>();
	432	+ String s="[{\"fxpf\":\"5769f0640cf2d37f034793a2\",\"fxysu\":\"色盲遗传史\",\"fyyse\":\"315107bd-91fe-42a1-9237-752f3c046a40\",\"score\":5,\"color\":\"risk_yellow\",\"otherId\":\"5a531d6bc07dbb92526b3566\"},{\"fxpf\":\"5769f0640cf2d37f034793a3\",\"fxysu\":\"阿斯顿发送到\",\"fyyse\":\"224b2329-cb82-4da3-a071-8527f8283aab\",\"score\":10,\"color\":\"risk_purple\",\"otherId\":\"5a531d6ac07dbb92526b3556\"}]";
	433	+ ResolveUtils.queryOtherRisk(s, listMap);
	434	+ System.out.println(listMap);
443	435	}
444	436
445	437	}