jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 71df14e88b80c0b88fdc84dabafa03c825330297

Authored by liquanyu
1 parent 86448f9079
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 6 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 71df14e
... ... @@ -2618,7 +2618,8 @@
2618 2618 Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
2619 2619 if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
2620 2620 {
2621   - handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
  2621 + handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null
  2622 + || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals("")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
2622 2623 }
2623 2624 newBabyManagerQueryModel.setHandDueWeek(handDueWeek);
2624 2625  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 71df14e
... ... @@ -2962,7 +2962,8 @@
2962 2962 Map<String, Object> handDueWeekMap = data.getHandDueWeek();
2963 2963 if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
2964 2964 {
2965   - handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
  2965 + handDueWeek = "孕"+String.valueOf(handDueWeekMap.get("week"))+"周"+((handDueWeekMap.get("day") == null
  2966 + || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals("")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
2966 2967 }
2967 2968  
2968 2969 map.put("handDueWeek", handDueWeek);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ 71df14e
... ... @@ -87,7 +87,8 @@
87 87 Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
88 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
  91 + || String.valueOf(handDueWeekMap.get("day")).equals("0") || String.valueOf(handDueWeekMap.get("day")).equals("")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
91 92 }
92 93 childbirthManagerQueryModel.setHandDueWeek(handDueWeek);
93 94