From 82024eb2847d809cb043acfc1eae85a6db6ac4cd Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 11 Jul 2018 14:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E5=A8=A9=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/BabyModel.java      | 12 ++++++++++++
 .../platform/operate/web/facade/BabyBookbuildingFacade.java  |  2 ++
 .../operate/web/request/BabyBookbuildingAddRequest.java      | 12 +++++++++++-
 .../lyms/platform/operate/web/result/BabyBuildResult.java    | 11 +++++++++++
 .../com/lyms/platform/operate/web/result/BabyPageResult.java |  2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index 529688f..69b5cf7 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -210,6 +210,10 @@ public class BabyModel extends BaseModel {
 
     //分娩孕周
     private Integer dueWeek;
+
+    //分娩孕周整周后的天
+    private Integer dueDay;
+
     //0-转诊待接收   0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档， 默认是母档案为null
     private String enable;
     //操作人
@@ -316,6 +320,14 @@ public class BabyModel extends BaseModel {
     //其他(写明病名并详细描述)
     private Map<String,Object> jxOther;
 
+    public Integer getDueDay() {
+        return dueDay;
+    }
+
+    public void setDueDay(Integer dueDay) {
+        this.dueDay = dueDay;
+    }
+
     public Integer getDataStatus() {
         return dataStatus;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 36bc819..4892c1a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1188,6 +1188,7 @@ public class BabyBookbuildingFacade {
         }
 
         bm.setDueWeek(b.getDueWeek());
+        bm.setDueDay(b.getDueDay());
         bm.setBabyDiagnosis(b.getBabyDiagnosis());
         bm.setBlNo(b.getBlNo());
 
@@ -1426,6 +1427,7 @@ public class BabyBookbuildingFacade {
         result.setBabyDiagnosis(model.getBabyDiagnosis());
         result.setBlNo(model.getBlNo());
         result.setDueWeek(model.getDueWeek());
+        result.setDueDay(model.getDueDay());
 
         if (StringUtils.isNotEmpty(model.getDeliverOrg()))
         {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
index 5a11af2..18a1c51 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
@@ -300,6 +300,10 @@ public class BabyBookbuildingAddRequest {
 	//分娩孕周
 	private Integer dueWeek;
 
+
+	//分娩孕周整周后的天
+	private Integer dueDay;
+
 	//儿童诊断
 	private String babyDiagnosis;
 
@@ -310,10 +314,16 @@ public class BabyBookbuildingAddRequest {
 
 	private Integer couponType;
 
-
 	//档案编号 滦平需求
 	private String fileCode;
 
+	public Integer getDueDay() {
+		return dueDay;
+	}
+
+	public void setDueDay(Integer dueDay) {
+		this.dueDay = dueDay;
+	}
 
 	public String getNbnaNum() {
 		return nbnaNum;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index 9a46961..1d6ee73 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -252,6 +252,9 @@ public class BabyBuildResult {
     private Integer dueWeek;
 
 
+    //分娩孕周整周后的天
+    private Integer dueDay;
+
     //儿童诊断
     private String babyDiagnosis;
 
@@ -268,6 +271,14 @@ public class BabyBuildResult {
     //显示服务信息
     private List<PatientSerResult> patientSerResults;
 
+    public Integer getDueDay() {
+        return dueDay;
+    }
+
+    public void setDueDay(Integer dueDay) {
+        this.dueDay = dueDay;
+    }
+
     public String getNbnaNum() {
         return nbnaNum;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index 9c3cd09..c1a93e6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -994,7 +994,7 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
 
         if (destModel.getDueWeek() != null)
         {
-            setDueWeek(destModel.getDueWeek() + "周");
+            setDueWeek(destModel.getDueWeek() + "周" + (destModel.getDueDay() != null ? String.valueOf(destModel.getDueDay()) +"天" : ""));
         }
 
         setDueType(FmTypeEnums.getFmNameById(destModel.getDueType()));
-- 
1.8.3.1