Commit c4121767c87b6c38eb57588dab022cb9fc9109e6

Authored by liquanyu
1 parent 6fcc625848

update

Showing 1 changed file with 2 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ c412176
... ... @@ -85,9 +85,9 @@
85 85 }
86 86 String handDueWeek = "";
87 87 Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
88   - if (handDueWeekMap != null && handDueWeekMap.size() > 0)
  88 + if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
89 89 {
90   - handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
  90 + handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
91 91 }
92 92 childbirthManagerQueryModel.setHandDueWeek(handDueWeek);
93 93