From 2d06c826ecc95d41ebdd1fe6dd66a53e3f58e6e7 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Thu, 6 Jun 2019 09:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E9=BE=84=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java |  1 +
 .../com/lyms/platform/operate/web/result/BabyBasicResult.java | 11 +++++++++++
 2 files changed, 12 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 c0a95cf..3e7470c 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
@@ -883,6 +883,7 @@ public class BabyCheckFacade {
                 base.setCardNo(model.getMcertNo());
                 base.setPregnantCertificateTypeId(model.getMcertTypeId());
                 base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
+                base.setMonth(DateUtil.getMonth(model.getBirth(), new Date()));
                 //计算儿童的预产期
                 if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期
                     String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth());
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 b31a39c..e92a6ca 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
@@ -25,6 +25,9 @@ public class BabyBasicResult {
     private String name;
     //儿童月龄
     private String monthAge;
+    //不转换的月龄
+    private Integer month;
+
     //检查日期
     private String checkDate;
     //诊断
@@ -77,6 +80,14 @@ public class BabyBasicResult {
      */
     private List<String> serviceList;
 
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
     public String getEndCase() {
         return endCase;
     }
-- 
1.8.3.1