From 4bf3f2e9a0e99bfd27a02b07ba0971deec07358b Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 13 Oct 2017 14:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=93=E9=87=8D=E5=B0=B1?=
 =?UTF-8?q?=E8=AF=8A=E5=8D=A1/=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BD=93=E9=87=8D?=
 =?UTF-8?q?=E5=92=8C=E8=BA=AB=E9=AB=98=E7=9A=84=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java  | 15 +++++++++++++++
 .../operate/web/result/PatientBaseResult.java       | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index d4bfd65..b34568b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -29,6 +29,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StopWatch;
@@ -89,6 +93,9 @@ public class PatientFacade {
     @Qualifier("commonThreadPool")
     private ThreadPoolTaskExecutor commonThreadPool;
 
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
 
     /**
      * 修改产妇的社区
@@ -1084,6 +1091,14 @@ public class PatientFacade {
             patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
         } catch (Exception e) {
         }
+        Patients p = mongoTemplate.findById(patientBaseResult.getId(), Patients.class);
+        if(p != null) {
+            AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
+            if(chuModel != null) {
+                patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
+                patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : "");
+            }
+        }
         return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
     }
 }
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
index 6a155f6..d5aac5a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java
@@ -33,6 +33,27 @@ public class PatientBaseResult {
     //1 孕妇 0  产妇
     private String isGravida;
 
+    //  身高
+    private String  height;
+    //体重
+    private String weight ;
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
     public String getIsGravida() {
         return isGravida;
     }
-- 
1.8.3.1