From af600f868747f14efa091d8ac7ba6d683efe17cf Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 27 Feb 2018 15:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MeasureInfoFacade.java       | 10 ++++++++++
 .../operate/web/result/MeasureBaseInfoResult.java   | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 7fa3baa..44d5632 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -515,6 +515,16 @@ public class MeasureInfoFacade {
             result.setAddress(userInfoModel.getAddress());
             result.setPhone(userInfoModel.getPhone());
             result.setVcCardNo(userInfoModel.getVcCardNo());
+
+            MeasureDataInfoQuery measureDataInfoQuery = new MeasureDataInfoQuery();
+            measureDataInfoQuery.setMeasureUserId(userInfoModel.getId());
+            measureDataInfoQuery.setValueType(1);
+            List<MeasureDataInfoModel> dataModels  = mysqlMeasureDataInfoService.queryMeasureDataInfoList(measureDataInfoQuery);
+            if (CollectionUtils.isNotEmpty(dataModels))
+            {
+                result.setHeight(dataModels.get(0).getValueOne() == null ? "" : dataModels.get(0).getValueOne());
+                result.setWeight(dataModels.get(0).getValueTwo() == null ? "" : dataModels.get(0).getValueTwo());
+            }
         }
         if ("216".equals(hospitalId))
         {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java
index 0078903..5f77ed1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java
@@ -47,6 +47,27 @@ public class MeasureBaseInfoResult {
     //指纹
     private String finger;
 
+    //身高
+    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 getUserName() {
         return userName;
     }
-- 
1.8.3.1