shiyang / regional-platform

Download as
Browse Code »

Commit e19fbd5009f436799a649916a188868139da26d9

Authored by jiangjiazhi
1 parent 32cac8cb60
Exists in master and in 1 other branch nobuildprocess

增加设置parentid

Showing 1 changed file with 20 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ e19fbd5
... ... @@ -251,17 +251,21 @@
251 251 highScoreResult.getHighRisk().add(map1);
252 252 //风险评分
253 253 Object idObj = map.get("fxpf");
254   - if (null != idObj) {
  254 + if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) {
255 255 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString());
256 256 highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0));
257 257 }
258 258 if(needLevel){
259 259 Object idObj1 = map.get("fyyse");
260   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
261   - Map<String, Object> map2 = new HashMap<>();
262   - map2.put("id", basicConfig.getId());
263   - map2.put("name", basicConfig.getName());
264   - highScoreResult.getLevel().add(map2);
  260 + if (null!=idObj1&&!"null".equals(idObj1.toString())&&!"".equals(idObj1.toString())) {
  261 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
  262 + if(null!=basicConfig){
  263 + Map<String, Object> map2 = new HashMap<>();
  264 + map2.put("id", basicConfig.getId());
  265 + map2.put("name", basicConfig.getName());
  266 + highScoreResult.getLevel().add(map2);
  267 + }
  268 + }
265 269 }
266 270 next=false;
267 271 }
268 272  
... ... @@ -295,17 +299,21 @@
295 299 highScoreResult.getHighRisk().add(map1);
296 300 //风险评分
297 301 Object idObj = map.get("fxpf");
298   - if (null != idObj) {
  302 + if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) {
299 303 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString());
300 304 highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0));
301 305 }
302 306 if(needLevel){
303 307 Object idObj1 = map.get("fyyse");
304   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
305   - Map<String, Object> map2 = new HashMap<>();
306   - map2.put("id", basicConfig.getId());
307   - map2.put("name", basicConfig.getName());
308   - highScoreResult.getLevel().add(map2);
  308 + if (null!=idObj1&&!"null".equals(idObj1.toString())&&!"".equals(idObj1.toString())) {
  309 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
  310 + if(null!=basicConfig){
  311 + Map<String, Object> map2 = new HashMap<>();
  312 + map2.put("id", basicConfig.getId());
  313 + map2.put("name", basicConfig.getName());
  314 + highScoreResult.getLevel().add(map2);
  315 + }
  316 + }
309 317 }
310 318 next=false;
311 319 }