From b529919071f82657373f75766b772c65e5dd6adc Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 6 Sep 2018 21:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E7=AD=9B=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/BabySieveModel.java     | 34 ++++++++++++++++++++++
 .../operate/web/facade/BabySieveFacede.java        |  6 +++-
 .../operate/web/result/BabySieveManager.java       | 11 +++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
index 4ef66e3..255e422 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java
@@ -2,9 +2,11 @@ package com.lyms.platform.pojo;
 
 import com.lyms.platform.beans.SerialIdEnum;
 import com.lyms.platform.common.result.BaseModel;
+import com.lyms.platform.common.utils.DateUtil;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -288,4 +290,36 @@ public class BabySieveModel extends BaseModel {
     public void setModified(Date modified) {
         this.modified = modified;
     }
+
+    public Map<String,String> convertToDataModel(){
+        Map<String,String> map = new HashMap<String,String>();
+        map.put("id",id);
+        map.put("testNumber",testNumber);
+        map.put("collectHospitalId",collectHospitalId);
+        map.put("currentHospitalId",currentHospitalId);
+        map.put("collectDocterId",collectDocterId);
+        map.put("collectDate", DateUtil.getYMDH(collectDate));
+        map.put("montherName",montherName);
+        map.put("zyNo",zyNo);
+        map.put("montherCardNo",montherCardNo);
+        map.put("montherDisease",montherDisease);
+        map.put("phone",phone);
+        map.put("address",address);
+        map.put("babyBirth",DateUtil.getYMDH(babyBirth));
+        map.put("babyName",babyName);
+        map.put("dueWeek",dueWeek);
+        map.put("dueType",dueType);
+        map.put("duescfs",duescfs);
+        if(sex != null){
+            map.put("sex",String.valueOf(sex));
+        }
+        map.put("diseaseSieve",diseaseSieve);
+        map.put("sendCheckHospitalId",sendCheckHospitalId);
+        map.put("babyId",babyId);
+        map.put("matdeliverId",matdeliverId);
+        map.put("patientId",patientId);
+        map.put("created",DateUtil.getyyyy_MM_dd(created));
+        map.put("modified",DateUtil.getyyyy_MM_dd(modified));
+        return map;
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
index 641ea8c..8fa0cf6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
@@ -318,6 +318,9 @@ public class BabySieveFacede {
                     babySieveManager.setCardNo(patients.getCardNo());
                     babySieveManager.setPhone(patients.getPhone());
                     babySieveManager.setBabyId(babyModel.getId());
+                    if(patients.getBirth() != null){
+                        babySieveManager.setAge(DateUtil.getAge(patients.getBirth()));
+                    }
                     List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
                     if (CollectionUtils.isNotEmpty(babies)) {
                         for (MaternalDeliverModel.Baby baby : babies) {
@@ -392,7 +395,7 @@ public class BabySieveFacede {
         BaseObjectResponse br = new BaseObjectResponse();
         BabySieveModel bm = babySieveService.findOneBabySieveById(id);
         if(bm != null){
-            br.setData(bm);
+            br.setData(bm.convertToDataModel());
             br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
             return br;
         }
@@ -452,6 +455,7 @@ public class BabySieveFacede {
             babySieveQuery.setTestNumber(babySieveAddRequest.getTestNumber());
         }
         List<BabySieveModel> list = babySieveService.getBabySieveQuery(babySieveQuery);
+        //明天继续
 
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java
index 5d6a13b..9d5fc7a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java
@@ -23,6 +23,9 @@ public class BabySieveManager {
     //母亲身份证号
     private String cardNo;
 
+    //母亲年龄
+    private Integer age;
+
     //母亲手机号
     private String phone;
 
@@ -67,6 +70,14 @@ public class BabySieveManager {
     //母亲姓名
     private String mName;
 
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
     public String getBabyId() {
         return babyId;
     }
-- 
1.8.3.1