From 426786e19fe49555fce09e2de2c9105b290993f2 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sun, 21 Nov 2021 19:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=AF=8D=E4=BA=B2=E9=AB=98?=
 =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java        | 81 +++++++++++++---------
 1 file changed, 48 insertions(+), 33 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 2b8a0ac..231dfdd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -1544,7 +1544,22 @@ public class BabyCheckFacade extends BaseServiceImpl {
 
                 base.setYn(model.getYn());
                 base.setDataStatus(model.getDataStatus());
-                base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
+
+                List <Map <String, Object>> mrisks = mongoUtil.findColor(model.getmHighRiskReason());
+                base.setmHighRiskReason(mrisks);
+
+                if (CollectionUtils.isNotEmpty(mrisks))
+                {
+                    StringBuilder sb = new StringBuilder();
+                    for (Map <String, Object> risk : mrisks)
+                    {
+                        sb.append(risk.get("name").toString());
+                        sb.append(" ");
+                    }
+                    base.setHighRisk(sb.toString());
+                }
+
+
                 if(CollectionUtils.isNotEmpty(model.getHighRiskInfo())){
                     List <Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(model.getHighRiskInfo());
                     for (Map h : highRiskInfos) {
@@ -1654,38 +1669,38 @@ public class BabyCheckFacade extends BaseServiceImpl {
                 }
 
 
-                //母亲是否高危
-                if (!StringUtils.isEmpty(model.getMcertNo())) {
-
-                    PatientsQuery patientsQuery = new PatientsQuery();
-                    if (StringUtils.isNotEmpty(model.getParentId()))
-                    {
-                        patientsQuery.setId(model.getParentId());
-                    }
-                    else
-                    {
-                        patientsQuery.setCardNo(model.getMcertNo());
-                    }
-                    patientsQuery.setYn(YnEnums.YES.getId());
-
-                    List <Patients> list = patientsService.queryPatient(patientsQuery);
-                    if (CollectionUtils.isNotEmpty(list)) {
-                        HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
-                        List <Map> listHighRisk = res.getHighRisk();
-
-                        if (CollectionUtils.isNotEmpty(listHighRisk)) {
-                            if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
-                                base.setHighRisk("健康");
-                            } else {
-                                base.setHighRisk("高危");
-                            }
-                        } else {
-                            base.setHighRisk("");
-                        }
-                        base.setHighRisk("sss");
-                    }
-
-                }
+//                //母亲是否高危
+//                if (!StringUtils.isEmpty(model.getMcertNo())) {
+//
+//                    PatientsQuery patientsQuery = new PatientsQuery();
+//                    if (StringUtils.isNotEmpty(model.getParentId()))
+//                    {
+//                        patientsQuery.setId(model.getParentId());
+//                    }
+//                    else
+//                    {
+//                        patientsQuery.setCardNo(model.getMcertNo());
+//                    }
+//                    patientsQuery.setYn(YnEnums.YES.getId());
+//
+//                    List <Patients> list = patientsService.queryPatient(patientsQuery);
+//                    if (CollectionUtils.isNotEmpty(list)) {
+//                        HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
+//                        List <Map> listHighRisk = res.getHighRisk();
+//
+//                        if (CollectionUtils.isNotEmpty(listHighRisk)) {
+//                            if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
+//                                base.setHighRisk("健康");
+//                            } else {
+//                                base.setHighRisk("高危");
+//                            }
+//                        } else {
+//                            base.setHighRisk("");
+//                        }
+//
+//                    }
+//
+//                }
 
                 base.setMremark(model.getMremark());
                 base.setMphone(model.getMphone());
-- 
1.8.3.1