jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 518d90eee7861ad16fcadc0065c81a93f0b0b050

Authored by wtt
1 parent c7ee66e4c8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 8 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 518d90e
... ... @@ -4000,8 +4000,15 @@
4000 4000 }
4001 4001 List <Map <String, Object>> list = new ArrayList <>();
4002 4002 List <Map <String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
4003   - if (CollectionUtils.isNotEmpty(checkList)) {
  4003 + /* if (CollectionUtils.isNotEmpty(checkList)) {
4004 4004 list.addAll(checkList);
  4005 + }*/
  4006 + if (CollectionUtils.isNotEmpty(checkList)) {
  4007 + if(highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && (StringUtils.isEmpty(oRisk) || "{}".equals(oRisk) || "[]".equals(oRisk)) ){
  4008 + list.addAll(checkList);
  4009 + }else if(!highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")){
  4010 + list.addAll(checkList);
  4011 + }
4005 4012 }
4006 4013 if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk) && !"[]".equals(oRisk)) {
4007 4014 List <Map <String, Object>> listOtherRisk = new ArrayList <>();