From 31a998f6dc93ecfaf9d3568c28adef0bf7675a80 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Thu, 23 Jul 2020 13:52:35 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/BabyEarFacade.java  |  1 +
 .../com/lyms/platform/operate/web/request/BabyEarBase.java   | 12 ++++++++++++
 .../lyms/platform/operate/web/result/BabyEarBaseView.java    | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index e34a65d..c89ae20 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -1516,6 +1516,7 @@ public class BabyEarFacade {
             babyEarBaseView.setSex(SexEnum.getTextById(babyEarBase.getSex()));
         }
         babyEarBaseView.setCardNo(babyEarBase.getCardNo());
+        babyEarBaseView.setEncoded(babyEarBase.getEncoded());
         if (babyEarBase.getNation() != null) {
             babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation()));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
index ec0a6f8..97f633f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
@@ -34,6 +34,9 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
     private Integer sex;
     //儿童身份证号
     private String cardNo;
+
+    // 编码唯一，通过编码获取档案信息，编码格式20200721001
+    private String encoded;
     //儿童生日
     private String birth;
     //民族
@@ -151,12 +154,21 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
         this.dataStatus = dataStatus;
     }
 
+    public String getEncoded() {
+        return encoded;
+    }
+
+    public void setEncoded(String encoded) {
+        this.encoded = encoded;
+    }
+
     public BabyEarBase(BabyModel babyModel) {
         setFileCode(babyModel.getFileCode());
         setBabyId(babyModel.getId());
         setPid(babyModel.getPid());
         setName(babyModel.getName());
         setCardNo(babyModel.getCardNo());
+        setEncoded(babyModel.getEncoded());
         setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
         setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
         setProvinceId(babyModel.getProvinceId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java
index f5dc8b7..9e1819e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java
@@ -8,6 +8,8 @@ import java.util.List;
  * @discription
  */
 public class BabyEarBaseView {
+    // 编码唯一，通过编码获取档案信息，编码格式20200721001
+    private String encoded;
     private String id;
     private String babyId;
     //儿童名字
@@ -122,6 +124,14 @@ public class BabyEarBaseView {
         this.patientSerResults = patientSerResults;
     }
 
+    public String getEncoded() {
+        return encoded;
+    }
+
+    public void setEncoded(String encoded) {
+        this.encoded = encoded;
+    }
+
     public String getDeliverOrg() {
         return deliverOrg;
     }
-- 
1.8.3.1