jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 21f38703d5f5d26d98f3f462c45bb838c5a01790

Authored by dongqin
2 parents 7ba66b76a9 cab5122e52
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 21f3870
... ... @@ -2618,7 +2618,7 @@
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 || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
2622 2622 }
2623 2623 newBabyManagerQueryModel.setHandDueWeek(handDueWeek);
2624 2624  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 21f3870
... ... @@ -2962,7 +2962,7 @@
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 || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
2966 2966 }
2967 2967  
2968 2968 map.put("handDueWeek", handDueWeek);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ 21f3870
... ... @@ -87,7 +87,7 @@
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 || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : "+"+String.valueOf(handDueWeekMap.get("day"))+"天" );
91 91 }
92 92 childbirthManagerQueryModel.setHandDueWeek(handDueWeek);
93 93