jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 58e67747313d33cec0cc162da89ba43c2d4c6831

Authored by yangfei
2 parents f65046ee0d 576c92a8b2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ 58e6774
... ... @@ -697,7 +697,7 @@
697 697 @RequestMapping(value = "/GetDeliveryInfo", method = RequestMethod.GET)
698 698 @ResponseBody
699 699 public Object getMatDeliverData(@RequestParam(required = true) String id,
700   - @RequestParam(required = true) String hospital) {
  700 + @RequestParam(required = false) String hospital) {
701 701 return viewFacade.getMatDeliverData(id,hospital);
702 702 }
703 703  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 58e6774
... ... @@ -4443,7 +4443,7 @@
4443 4443 Date fmDate = DateUtil.parseYMDHM(baby.getDueTime());
4444 4444  
4445 4445 //出生孕周(周)
4446   - map.put("babyweek", "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""));
  4446 + map.put("babyweek", String.valueOf(week));
4447 4447 //新生儿出生日期
4448 4448 map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate));
4449 4449