From 47ebc8f5687bb0d8535d66a89e44fd95f81e73c8 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 4 Jul 2016 16:24:25 +0800
Subject: [PATCH] update code

---
 .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java |  9 ++++++---
 .../com/lyms/platform/operate/web/result/BabyCheckResult.java | 11 +++++++++++
 2 files changed, 17 insertions(+), 3 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 b7ba770..675933c 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
@@ -94,7 +94,7 @@ public class BabyCheckFacade {
 
 
         model.setTemperature(request.getTemperature());
-        model.setWeight(request.getHeight());
+        model.setHeight(request.getHeight());
         model.setWeight(request.getWeight());
         model.setHead(request.getHead());
         model.setHeightWeight(request.getHeightWeight());
@@ -146,6 +146,8 @@ public class BabyCheckFacade {
         model.setChestw(request.getChestw());
 
 
+
+
         model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));
 
         return model;
@@ -435,7 +437,7 @@ public class BabyCheckFacade {
 
 
         model.setTemperature(checkModel.getTemperature());
-        model.setWeight(checkModel.getHeight());
+        model.setHeight(checkModel.getHeight());
         model.setWeight(checkModel.getWeight());
         model.setHead(checkModel.getHead());
         model.setHeightWeight(checkModel.getHeightWeight());
@@ -482,8 +484,9 @@ public class BabyCheckFacade {
         model.setCheckDoctor(checkModel.getCheckDoctor());
         model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
         model.setHighRisk(checkModel.getHighRisk());
+        model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
 
-        model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getBregma(), Map.class));
+        model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class));
         model.setChestw(checkModel.getChestw());
 
         return model;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
index 732c85e..d0cfdc7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
@@ -196,6 +196,17 @@ public class BabyCheckResult {
     //是否高危儿童 0 非高危 1高危
     private Integer highRisk;
 
+    //检查时间
+    private String checkDate;
+
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+
     public Map getDrugGllergic() {
         return drugGllergic;
     }
-- 
1.8.3.1