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 90a8656..bd1bf6a 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
@@ -300,7 +300,7 @@ public class MatDeliverController extends BaseController{
             for (String key : query.keySet()) {
                 queryStr += key + ",";
             }
-            childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1));
+            childbirthManagerRequest.setInitQuery(queryStr+"fmTime");
 
             childbirthManagerRequest.setExcel(true);
             // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
@@ -314,7 +314,7 @@ public class MatDeliverController extends BaseController{
                 Map<String, Object> map = new LinkedHashMap<>();
                 map.put("num",num);
                 map.put("dueDate",queryModel.getDueDate());
-                map.put("dueTime",queryModel.getDueDate());
+                map.put("fmTime",queryModel.getFmTime());
                 map.put("zyNo","-");
                 map.put("name",queryModel.getName());
                 map.put("age", queryModel.getAge());
@@ -351,8 +351,8 @@ public class MatDeliverController extends BaseController{
                 map.put("A","-");
                 map.put("Y","-");
                 map.put("M","-");
-                map.put("fetalPosition", queryModel.getFetalPosition());
-                map.put("perinealCondition",queryModel.getPerinealCondition());
+                map.put("fetalPosition", queryModel.getFetalPosition() == null ? "" : queryModel.getFetalPosition());
+                map.put("perinealCondition",queryModel.getPerinealCondition() == null ? "" : queryModel.getPerinealCondition());
 
                 String reslult1 = "";
                 String reslult2 = "";
@@ -371,16 +371,27 @@ public class MatDeliverController extends BaseController{
                 map.put("deliveryMode4","");
                 map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL());
                 map.put("sex",queryModel.getSex());
-                map.put("height",queryModel.getBabyHeight());
-                map.put("weight",queryModel.getBabyWeight());
+                map.put("height",queryModel.getBabyHeight() == null ? "" : Double.parseDouble(queryModel.getBabyHeight()) * 1000);
+                map.put("weight",queryModel.getBabyWeight() == null ? "" : Double.parseDouble(queryModel.getBabyWeight()) * 1000);
                 map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation());
                 //queryModel.getTireNumber()-queryModel.getLivingNumber()
                 map.put("sc",queryModel.getPregnancyOut());//死产
 
                 String jcsc = "";
-                if (queryModel.getContactM() != null)
+                if (queryModel.getContactM() != null && queryModel.getContactM().contains(","))
                 {
-                    jcsc = "√";
+                    String[] arrs = queryModel.getContactM().split(",");
+                    for (int i = 0 ;i < arrs.length ; i++)
+                    {
+                        if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30)
+                        {
+                            jcsc = "√";
+                            if (i != arrs.length -1)
+                            {
+                                jcsc += ",";
+                            }
+                        }
+                    }
                 }
                 map.put("jzsx",jcsc);//皮肤接触及早吸吮≥30分钟
                 map.put("xj","-");//宣教
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
index 547a7a1..1cbc9a5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
@@ -401,6 +401,15 @@ public class ChildbirthManagerQueryModel {
     private String fmHospital;
     // 院内信息结束
 
+    private String fmTime;
+
+    public String getFmTime() {
+        return fmTime;
+    }
+
+    public void setFmTime(String fmTime) {
+        this.fmTime = fmTime;
+    }
 
     public String getContactM() {
         return contactM;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index ec95e6a..fcb9402 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -154,6 +154,7 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                         String babyHealthy = "";
                         String malformation = "";
                         String contactM = "";
+                        String fmTime = "";
                         try {
                             for (BabyModel babyModel : babyModelList) {
                                 if (initQuery.contains("pregnancyOut")) {
@@ -173,15 +174,15 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                                             sex += sexEnum.getText() + ",";
                                             break;
                                         }
-                                        if (org.apache.commons.lang.StringUtils.isEmpty(sex)) {
-                                            sex += "-,";
-                                        }
                                     }
                                 }
 
                                 if (initQuery.contains("contactM")) {
                                     contactM+=babyModel.getContactM()+ ",";
                                 }
+                                if (initQuery.contains("fmTime")) {
+                                    fmTime+= new SimpleDateFormat("HH:mm").format(babyModel.getBirth())+ ",";
+                                }
 
                                 babyWeight += babyModel.getBabyWeight() == null ? "-," : babyModel.getBabyWeight() + ",";
                                 babyHeight += babyModel.getBabyHeight() == null ? "-," : babyModel.getBabyHeight() + ",";
@@ -215,6 +216,7 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                         childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
                         childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
                         childbirthManagerQueryModel.setContactM(contactM.length() == 0 ? "" : contactM.substring(0, contactM.length() - 1));
+                        childbirthManagerQueryModel.setFmTime(fmTime.length() == 0 ? "" : fmTime.substring(0, fmTime.length() - 1));
                     }
                 }