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 230e224..1072fc5 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 @@ -85,9 +85,9 @@ public class MaterDeliverWorker implements Callable handDueWeekMap = maternalDeliverModel.getHandDueWeek(); - if (handDueWeekMap != null && handDueWeekMap.size() > 0) + 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"))+"天" ); } childbirthManagerQueryModel.setHandDueWeek(handDueWeek);