From 518d90eee7861ad16fcadc0065c81a93f0b0b050 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sat, 20 Feb 2021 14:07:17 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/AntenatalExaminationFacade.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index dd7cdd5..89439ff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -4000,8 +4000,15 @@ public class AntenatalExaminationFacade {
         }
         List <Map <String, Object>> list = new ArrayList <>();
         List <Map <String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
-        if (CollectionUtils.isNotEmpty(checkList)) {
+       /* if (CollectionUtils.isNotEmpty(checkList)) {
             list.addAll(checkList);
+        }*/
+        if (CollectionUtils.isNotEmpty(checkList)) {
+            if(highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && (StringUtils.isEmpty(oRisk) || "{}".equals(oRisk) || "[]".equals(oRisk)) ){
+                list.addAll(checkList);
+            }else if(!highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")){
+                list.addAll(checkList);
+            }
         }
         if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk) && !"[]".equals(oRisk)) {
             List <Map <String, Object>> listOtherRisk = new ArrayList <>();
-- 
1.8.3.1