From a5bc8897fb54d5ff69c41689780496e50d8c6132 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Tue, 6 Aug 2024 15:18:07 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=87=BA=E7=94=9F?=
 =?UTF-8?q?=E8=AF=81=E6=98=8E=E5=A7=93=E3=80=81=E5=90=8D=E7=AD=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/BabyModel.java     | 19 ++++++++++
 .../operate/web/facade/PatientServiceFacade.java   |  4 +++
 .../platform/operate/web/result/BirthResult.java   | 42 +++++++++++++++++++++-
 3 files changed, 64 insertions(+), 1 deletion(-)

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 19244d3..edf0319 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
@@ -253,6 +253,9 @@ public class BabyModel extends BaseModel {
      */
     private String name;
 
+    private String firstName;
+    private String lastName;
+
     //儿童姓名首字母拼音
     private String firstPyName;
 
@@ -2771,6 +2774,22 @@ public class BabyModel extends BaseModel {
         this.name = name;
     }
 
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 83c92c6..36b57a2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -1905,6 +1905,8 @@ public class PatientServiceFacade {
         babyModel.setDeliverOrg(birthResult.getDeliverOrg());
         babyModel.setSex(birthResult.getBabySex());
         babyModel.setName(birthResult.getBabyName());
+        babyModel.setFirstName(birthResult.getFirstName());
+        babyModel.setLastName(birthResult.getLastName());
         babyService.updateOneBaby(babyModel,babyModel.getId());
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         baseResponse.setErrormsg("成功");
@@ -1938,6 +1940,8 @@ public class PatientServiceFacade {
             birthResult.setCommunityId(babyModel.getCommunityId());
             birthResult.setDeliverOrg(babyModel.getDeliverOrg());
             birthResult.setBlNo(babyModel.getBlNo());
+            birthResult.setFirstName(babyModel.getFirstName());
+            birthResult.setLastName(babyModel.getLastName());
         }
         baseResponse.setObject(birthResult);
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java
index fd623c5..84a2ac1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java
@@ -1,6 +1,8 @@
 package com.lyms.platform.operate.web.result;
 
 
+import com.lyms.platform.common.utils.DateUtil;
+
 import java.util.Date;
 
 public class BirthResult {
@@ -13,11 +15,13 @@ public class BirthResult {
     // 分娩孕周
     private String dueWeek;
     private Date fmDate;
+    private Date birth;
     /**
      * @auther HuJiaqi
      * @createTime 2016年12月20日 14时42分
      * @discription 年龄
      */
+    @SuppressWarnings("unused")
     private Integer age;
     //孕妇国籍Id
     private String pcountryId;
@@ -36,6 +40,8 @@ public class BirthResult {
      * @discription 丈夫姓名
      */
     private String husbandName;
+    //丈夫电话
+    private String husbandPhone;
     //证件号
     private String hcertificateNum;
     //国籍Id
@@ -90,9 +96,27 @@ public class BirthResult {
      * 小孩名称
      */
     private String babyName;
+    private String firstName;
+    private String lastName;
     //病历号(住院号)
     private String blNo;
 
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
     public String getBabyId() {
         return babyId;
     }
@@ -174,7 +198,7 @@ public class BirthResult {
     }
 
     public Integer getAge() {
-        return age;
+         return DateUtil.getAge(birth);
     }
 
     public void setAge(Integer age) {
@@ -428,4 +452,20 @@ public class BirthResult {
     public void setBabyName(String babyName) {
         this.babyName = babyName;
     }
+
+    public Date getBirth() {
+        return birth;
+    }
+
+    public void setBirth(Date birth) {
+        this.birth = birth;
+    }
+
+    public String getHusbandPhone() {
+        return husbandPhone;
+    }
+
+    public void setHusbandPhone(String husbandPhone) {
+        this.husbandPhone = husbandPhone;
+    }
 }
-- 
1.8.3.1