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 fb784e37..252395a 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
@@ -1091,8 +1091,11 @@ public class BabyBookbuildingFacade {
             bm.setCreated(new Date());
         }
 
+        // 编码,新增时候增加修改不做处理
+        if(StringUtils.isEmpty(b.getId())){
+            bm.setEncoded(getEncodedUtil());
+        }
         //新生儿民族Id
-        bm.setEncoded(getEncodedUtil());// 编码
         bm.setBnationId(b.getBnationId());//新生儿民族Id
 
         bm.setLiveType(b.getLiveType());
@@ -1325,7 +1328,7 @@ public class BabyBookbuildingFacade {
                     return  DateUtil.getDateNumber(encoded);
                 }
             }
-            return  DateUtil.getDateNumber("");
+            return  DateUtil.getDateNumber("0");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1427,6 +1430,9 @@ public class BabyBookbuildingFacade {
      */
     private BabyBuildResult getBabyBuildResult(BabyModel model) {
         BabyBuildResult result = new BabyBuildResult();
+        result.setEncoded(model.getEncoded());//儿童建档编码
+        result.setBnationId(model.getBnationId());//儿童民族
+
         result.setLiveType(model.getLiveType());
         result.setYn(model.getYn());
         result.setDataStatus(model.getDataStatus());
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 a103540..a33fd9f 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
@@ -69,7 +69,10 @@ public class BabyBuildResult {
     private String fatherProfessionTypeId;
 
     /***********儿童信息***********/
-
+    // 编码唯一，通过编码获取档案信息，编码格式20200721001
+    private String encoded;
+    //新生儿民族Id
+    private String bnationId;
     //儿童名称
     private String babyName;
 
@@ -345,6 +348,21 @@ public class BabyBuildResult {
         this.babyHighRiskReason = babyHighRiskReason;
     }
 
+    public String getEncoded() {
+        return encoded;
+    }
+
+    public void setEncoded(String encoded) {
+        this.encoded = encoded;
+    }
+
+    public String getBnationId() {
+        return bnationId;
+    }
+
+    public void setBnationId(String bnationId) {
+        this.bnationId = bnationId;
+    }
 
     public List<PatientSerResult> getPatientSerResults() {
         return patientSerResults;
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 2048e2f..307fe64 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.enums.FmTypeEnums;
 import com.lyms.platform.common.enums.ServiceStatusEnums;
@@ -10,6 +11,8 @@ import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.utils.UnitConstants;
 import com.lyms.platform.pojo.BabyModel;
+import com.lyms.platform.pojo.BasicConfig;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -39,6 +42,11 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
      //儿童名称
      private String babyName;
 
+    // 编码唯一，通过编码获取档案信息，编码格式20200721001
+    private String encoded;
+    //新生儿民族Id
+    private String bnationId;
+
     //儿童性别
     private String sex;
 
@@ -341,6 +349,21 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     }
 
 
+    public String getEncoded() {
+        return encoded;
+    }
+
+    public void setEncoded(String encoded) {
+        this.encoded = encoded;
+    }
+
+    public String getBnationId() {
+        return bnationId;
+    }
+
+    public void setBnationId(String bnationId) {
+        this.bnationId = bnationId;
+    }
 
     public List<String> getmHighRiskReason() {
         return mHighRiskReason;
@@ -987,6 +1010,8 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     @Override
     public BabyPageResult convertToResult(BabyModel destModel) {
         List<String> list = destModel.getmHighRiskReason();
+        setEncoded(destModel.getEncoded());
+        setBnationId(destModel.getBnationId() == null ? "" : getBasicConfig(destModel.getBnationId()));//民族
         setId(destModel.getId());
         setPid(destModel.getPid());
         setBabyName(destModel.getName());
@@ -1107,4 +1132,16 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     public void setCouponCode(String couponCode) {
         this.couponCode = couponCode;
     }
+    @Autowired
+    private BasicConfigService basicConfigService;
+    private String getBasicConfig(String id) {
+        if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) {
+            return "";
+        }
+        BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
+        if (null != basicConfig) {
+            return basicConfig.getName();
+        }
+        return "";
+    }
 }