From 71df14e88b80c0b88fdc84dabafa03c825330297 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 2 Dec 2019 16:11:34 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java    | 3 ++-
 .../src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 3 ++-
 .../java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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 d12cf7f..18d0ee5 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
@@ -2618,7 +2618,8 @@ public class MatDeliverFacade {
                     Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
                     if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
                     {
-                        handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0"))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
+                        handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null
+                                || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals(""))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
                     }
                     newBabyManagerQueryModel.setHandDueWeek(handDueWeek);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 491ea00..d68a8b2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2962,7 +2962,8 @@ public class ViewFacade {
         Map<String, Object> handDueWeekMap = data.getHandDueWeek();
         if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
         {
-            handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0"))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
+            handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null
+                    || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals(""))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
         }
 
         map.put("handDueWeek", handDueWeek);
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 b6da160..d6d2405 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
@@ -87,7 +87,8 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                 Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
                 if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
                 {
-                    handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0"))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
+                    handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null
+                            || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals(""))  ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
                 }
                 childbirthManagerQueryModel.setHandDueWeek(handDueWeek);
 
-- 
1.8.3.1