From 92e1e80c77c0ee732f8d653913616364d956e019 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 2 May 2016 11:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=AD=A9=E8=AE=BF=E8=A7=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0days=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/BabyVisitModel.java    | 11 +++++++++++
 .../platform/operate/web/request/BabyVisitAddRequest.java   |  4 ++++
 .../lyms/platform/operate/web/result/BabyVisitResult.java   | 13 ++++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
index 05aa17e..04617f4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
@@ -32,6 +32,16 @@ public class BabyVisitModel extends BaseModel {
     private Date created;
     private Date modified;
 
+    private String days;
+
+    public String getDays() {
+        return days;
+    }
+
+    public void setDays(String days) {
+        this.days = days;
+    }
+
     /**
      * 新生儿的id
      */
@@ -65,6 +75,7 @@ public class BabyVisitModel extends BaseModel {
         this.modified = modified;
     }
 
+
     /*   // 名称
     private String name;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
index e6d5024..ce2a4b9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.BabyVisitModel;
 import com.lyms.platform.pojo.Patients;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.Map;
 
@@ -753,6 +754,9 @@ public class BabyVisitAddRequest implements IBasicRequestConvert<BabyVisitModel>
         babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate));
         babyVisitModel.setDoctorSign(doctorSign);
         babyVisitModel.setId(id);
+        if(StringUtils.isNotEmpty(birth)&&StringUtils.isNotEmpty(currentVisit)){
+            babyVisitModel.setDays((DateUtil.getDays(DateUtil.parseYMD(birth), DateUtil.parseYMD(currentVisit)) + 1) + "");
+        }
         return babyVisitModel;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
index 4651daf..6a81c19 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
@@ -236,11 +236,22 @@ public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult, Pue
         @Id
         private String id;
 
+        /**
+         * 分娩后的天数
+         */
+        private String days;
+
 
 
         // 母亲患病情况
 
+        public String getDays() {
+            return days;
+        }
 
+        public void setDays(String days) {
+            this.days = days;
+        }
 
         // 出生情况
         private Map birthSituation;
@@ -716,7 +727,7 @@ public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult, Pue
             setBirthSituation(JsonUtil.str2Obj(destModel.getBirthSituation(), Map.class));
             setNeonatalAsphyxia(destModel.getNeonatalAsphyxia());
             setDeformity(JsonUtil.str2Obj(destModel.getDeformity(), Map.class));
-
+            setDays(destModel.getDays());
             setHearing(destModel.getHearing());
             setDisease(JsonUtil.str2Obj(destModel.getDisease(),Map.class));
             setBirthWeight(destModel.getBirthWeight());
-- 
1.8.3.1