From 68e4acf340295e9f7b30437345ea2675b320f90a Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Thu, 9 Sep 2021 18:23:45 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyCheckFacade.java        | 29 ++++++++++++++++++++++
 .../operate/web/result/BabyBasicResult.java        | 13 ++++++++++
 2 files changed, 42 insertions(+)

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 8abacac..9d34378 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
@@ -27,6 +27,7 @@ import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import com.mongodb.BasicDBObject;
+import jdk.nashorn.internal.ir.LiteralNode;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -1064,6 +1065,17 @@ public class BabyCheckFacade extends BaseServiceImpl {
         resMap.put("baseInfo", base);
         resMap.put("checkList", list);
 
+        //秦皇岛需求，查询最后一次检查的高危详情
+        if(CollectionUtils.isNotEmpty(list)){
+            String babyCheckId=list.get(list.size()-1).get("id");
+            Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
+            Query queryBabyCheck=Query.query(criterBabyCheck);
+            BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
+            resMap.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
+        }else {
+            resMap.put("qhdHighRiskInfo","");
+        }
+
 
         br.setData(resMap);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
@@ -1251,6 +1263,9 @@ public class BabyCheckFacade extends BaseServiceImpl {
             map.put("diagnoseList",diagnoseList);
             map.put("height", babyCheckModel.getHeight());
             map.put("weight", babyCheckModel.getWeight());
+            //秦皇岛需求，查询最后一次检查的高危详情
+            map.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
+
             list.add(map);
         }
         pageResult.setGrid(list);
@@ -1657,6 +1672,20 @@ public class BabyCheckFacade extends BaseServiceImpl {
                 base.setKindergarten(null!=model.getKindergarten()?model.getKindergarten():null);
                 base.setBasicOrganization(null!=model.getBasicOrganization()?model.getBasicOrganization():null);
 
+                //秦皇岛需求，查询最后一次检查的高危详情
+                if(null!=id){
+                    Criteria criterList=Criteria.where("buildId").is(id);
+                    Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "checkDate"));
+                    List<BabyCheckModel> babyCheckList=mongoTemplate.find(queryList, BabyCheckModel.class);
+                    String babyCheckId=babyCheckList.get(0).getId();
+                    Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
+                    Query queryBabyCheck=Query.query(criterBabyCheck);
+                    BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
+                    base.setQhdHighRiskInfo(babyCheckModel.getHighRiskInfo());
+                }else {
+                    base.setQhdHighRiskInfo(null);
+                }
+
             }
         }
         return model;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
index e444383..81d8c42 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
@@ -127,6 +127,19 @@ public class BabyBasicResult {
     private Integer kindergarten;//2：幼儿园转诊--幼儿园机构
     private Integer basicOrganization;//3:基层转诊--基层机构
 
+    /***********************************************
+     *秦皇岛 儿保检查诊断位置用儿童高危详情替换
+     */
+    private List<String> qhdHighRiskInfo;
+
+    public List<String> getQhdHighRiskInfo() {
+        return qhdHighRiskInfo;
+    }
+
+    public void setQhdHighRiskInfo(List<String> qhdHighRiskInfo) {
+        this.qhdHighRiskInfo = qhdHighRiskInfo;
+    }
+
     public String getBabySource() {
         return babySource;
     }
-- 
1.8.3.1