Commit e6fb239b4df817df68032771a78c2d761dcb69ec

Authored by wtt
1 parent 5aaa382d3a

update

Showing 1 changed file with 27 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java View file @ e6fb239
... ... @@ -410,36 +410,41 @@
410 410 }
411 411 return number;
412 412 }
  413 +
413 414 private void getHighRiskMap(List <Map <String, String>> list, List highRiskDiagnose) {
414   - for (Object obj : highRiskDiagnose) {
415   - if (obj != null) {
416   - BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
417   - basicConfigQuery.setYn(YnEnums.YES.getId());
418   - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断
419   - basicConfigQuery.setId(String.valueOf(obj));
420   - List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
421   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
422   - Map <String, String> map = new HashMap <>();
423   - map.put("id", datas.get(0).getId());
424   - map.put("name", datas.get(0).getName());
425   - list.add(map);
426   - } //秦皇岛诊断内容是高危内容,如果不是诊断就判断是高危内容
427   - else if (org.apache.commons.collections.CollectionUtils.isEmpty(datas)) {
428   - BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
429   - basicConfigQuery1.setYn(YnEnums.YES.getId());
430   - basicConfigQuery1.setId(String.valueOf(obj));
431   - List <BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1);
432   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas2)) {
  415 + if (highRiskDiagnose != null) {
  416 +
  417 + for (Object obj : highRiskDiagnose) {
  418 + if (obj != null) {
  419 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  420 + basicConfigQuery.setYn(YnEnums.YES.getId());
  421 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断
  422 + basicConfigQuery.setId(String.valueOf(obj));
  423 + List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  424 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
433 425 Map <String, String> map = new HashMap <>();
434   - map.put("id", datas2.get(0).getId());
435   - map.put("name", datas2.get(0).getName());
  426 + map.put("id", datas.get(0).getId());
  427 + map.put("name", datas.get(0).getName());
436 428 list.add(map);
  429 + } //秦皇岛诊断内容是高危内容,如果不是诊断就判断是高危内容
  430 + else if (org.apache.commons.collections.CollectionUtils.isEmpty(datas)) {
  431 + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
  432 + basicConfigQuery1.setYn(YnEnums.YES.getId());
  433 + basicConfigQuery1.setId(String.valueOf(obj));
  434 + List <BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1);
  435 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas2)) {
  436 + Map <String, String> map = new HashMap <>();
  437 + map.put("id", datas2.get(0).getId());
  438 + map.put("name", datas2.get(0).getName());
  439 + list.add(map);
  440 + }
437 441 }
438   - }
439 442  
  443 + }
440 444 }
441 445 }
442 446 }
  447 +
443 448 private String getHighRiskDiagnoseStr(BabyHighRiskBabyModel babyHighRiskBabyModel) {
444 449 String diagnoseValue = "";
445 450 if (CollectionUtils.isNotEmpty(babyHighRiskBabyModel.getHighRiskDiagnose())) {