From 70614157ca4fa482cd215069d1ebd91c4aa685ab Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 7 Apr 2017 16:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0soureceid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/BabyCheckFacade.java   |  1 +
 .../lyms/platform/operate/web/result/BabyBasicResult.java   | 13 +++++++++++++
 2 files changed, 14 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 dbad446..a86a372 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
@@ -548,6 +548,7 @@ public class BabyCheckFacade {
                 base.setCardNo(model.getMcertNo());
                 base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
                 base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
+                base.setSourceId(org.apache.commons.lang.StringUtils.isNotEmpty(model.getSource())?model.getSource():model.getId());
                 if (model.getPid() != null) {
                     //诊断
                     List list = getBabyLastDiagnose(model.getPid());
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 5999e2e..493c829 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
@@ -8,6 +8,8 @@ import java.util.Map;
  */
 public class BabyBasicResult {
     private String id;
+
+    private String sourceId;
     //儿童姓名
     private String name;
     //儿童月龄
@@ -35,6 +37,17 @@ public class BabyBasicResult {
     //是否高危儿童 0 非高危 1高危
     private Integer babyLastHighRisk;
 
+
+    public String getSourceId()
+    {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId)
+    {
+        this.sourceId = sourceId;
+    }
+
     public Integer getBabyLastHighRisk() {
         return babyLastHighRisk;
     }
-- 
1.8.3.1