diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 57ab44d..02c7ea0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -26,7 +26,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 产妇分娩记录
@@ -146,11 +149,16 @@ public class MatDeliverController extends BaseController{
             List<Map<String, Object>> list = new ArrayList<>();
             for (ChildbirthManagerQueryModel childbirthManagerQueryModel : childbirthManagerQueryModelList) {
                 Map<String, Object> map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel);
+                for (String key : map.keySet()) {
+                    if (StringUtils.isEmpty(String.valueOf(map.get(key)))) {
+                        map.put(key, "-");
+                    }
+                }
                 list.add(map);
             }
             Map<String, String> header = new LinkedHashMap<>();
             header.put("dueDate", "分娩日期");
-            header.put("username", "姓名");
+            header.put("name", "姓名");
             header.put("age", "年龄");
             header.put("cardNo", "证件号");
             header.put("dueWeek", "分娩孕周");
@@ -180,7 +188,6 @@ public class MatDeliverController extends BaseController{
         BaseListResponse baseListResponse;
         try {
             newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
-            newBabyManagerRequest.setExcel(true);
             NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest);
             if (newBabyManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
                 baseListResponse = new BaseListResponse().setErrorcode(newBabyManagerResult.getErrorcode()).setErrormsg(newBabyManagerResult.getErrormsg());
@@ -199,6 +206,7 @@ public class MatDeliverController extends BaseController{
     public void newBabyManagerExcel(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest, HttpServletResponse httpServletResponse) {
         try {
             newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
+            newBabyManagerRequest.setExcel(true);
             // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
             @SuppressWarnings("unchecked")
             List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest).getData();
@@ -226,6 +234,11 @@ public class MatDeliverController extends BaseController{
                 if ("2".equals(dueType)) {
                     map.put("dueType", "剖宫产");
                 }
+                for (String key : map.keySet()) {
+                    if (StringUtils.isEmpty(String.valueOf(map.get(key)))) {
+                        map.put(key, "-");
+                    }
+                }
                 list.add(map);
             }
             Map<String, String> header = new LinkedHashMap<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 4079e4e..21acce4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -19,6 +19,7 @@ import com.lyms.platform.operate.web.result.BasicConfigResult;
 import com.lyms.platform.operate.web.result.PatientManagerQueryModel;
 import com.lyms.platform.operate.web.result.PatientManagerResult;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -299,6 +300,11 @@ public class PuerperaManageController extends BaseController {
             List<Map<String, Object>> list = new ArrayList<>();
             for (PatientManagerQueryModel patientManagerQueryModel : patientManagerQueryModelList) {
                 Map<String, Object> map = BeanUtils.objectToObjectMap(patientManagerQueryModel);
+                for (String key : map.keySet()) {
+                    if (StringUtils.isEmpty(String.valueOf(map.get(key)))) {
+                        map.put(key, "-");
+                    }
+                }
                 list.add(map);
             }
             Map<String, String> header = new LinkedHashMap<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 13c94fa..8888e68 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -1,6 +1,9 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.*;
+import com.lyms.platform.biz.service.BabyService;
+import com.lyms.platform.biz.service.DischargeAbstractBabyService;
+import com.lyms.platform.biz.service.DischargeAbstractMotherService;
+import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.RenShenJieJuEnums;
 import com.lyms.platform.common.enums.YnEnums;
@@ -110,6 +113,7 @@ public class DischargeAbstractFacade {
         List<Integer> typeList = new ArrayList<>();
         typeList.add(1);
         typeList.add(3);
+        patientsQuery.setBuildTypeNot(1);
         patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
         patientsQuery.setTypeList(typeList);
         patientsQuery.setSort("lastMenses");
@@ -157,7 +161,7 @@ public class DischargeAbstractFacade {
         }
 
         dischargeAbstractQueryResult.setGestationalWeeks(PredictedStatisticsFacade.getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
-        dischargeAbstractQueryResult.setDueDate(new SimpleDateFormat("yyyy年MM月dd日").format(patients.getDueDate()));
+        dischargeAbstractQueryResult.setDueDate(patients.getDueDate() == null ? "" : new SimpleDateFormat("yyyy年MM月dd日").format(patients.getDueDate()));
 
         // 查询母亲信息
         DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 43556c2..4193168 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1321,6 +1321,7 @@ public class MatDeliverFacade {
                     newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
                     newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
                     newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
+                    newBabyManagerQueryModel.setBabyWeight(StringUtils.isEmpty(babyModel.getBabyWeight()) ? "-" : String.valueOf(Double.valueOf(babyModel.getBabyWeight()) * 1000));
 
                     for (SexEnum sexEnum : SexEnum.values()) {
                         if (sexEnum.getId().equals(babyModel.getSex())) {