From 65086d64253c88a55986c94ab13c18fd2acd3a9d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 23 Oct 2018 17:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/MatDeliverController.java      | 15 ++++++++++-----
 .../platform/operate/web/worker/MaterDeliverWorker.java   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

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 e2ddfd0..cd0f423 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
@@ -399,11 +399,16 @@ public class MatDeliverController extends BaseController{
                     {
                         if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30)
                         {
-                            jcsc = "√";
-                            if (i != arrs.length -1)
-                            {
-                                jcsc += ",";
-                            }
+                            jcsc += "√";
+
+                        }
+                        else
+                        {
+                            jcsc += "-";
+                        }
+                        if (i != arrs.length -1)
+                        {
+                            jcsc += ",";
                         }
                     }
                 }
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 fcb9402..2ae5260 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
@@ -178,7 +178,7 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                                 }
 
                                 if (initQuery.contains("contactM")) {
-                                    contactM+=babyModel.getContactM()+ ",";
+                                    contactM+=babyModel.getContactM() == null ? "-": babyModel.getContactM()+ ",";
                                 }
                                 if (initQuery.contains("fmTime")) {
                                     fmTime+= new SimpleDateFormat("HH:mm").format(babyModel.getBirth())+ ",";
-- 
1.8.3.1