jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 564b1b31ddb84b5a6f164929a64792497870f151

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

衡水滦平修改

Showing 3 changed files with 21 additions and 7 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 564b1b3
... ... @@ -1877,12 +1877,13 @@
1877 1877  
1878 1878  
1879 1879 public static void main(String[] args) {
  1880 + System.out.println(getBabyMonthAge(parseYMD("2022-06-15"),new Date()));
1880 1881  
1881   - Date startDate = DateUtil.addMonth(new Date(),-12);
1882   - Date endDate = DateUtil.addDay(startDate, 18);
1883   - System.out.println(getyyyy_MM_dd(startDate));
1884   - System.out.println(getyyyy_MM_dd(endDate));
1885   - System.out.println(getyyyy_MM_dd(DateUtil.addMonth(endDate,6)));
  1882 +// Date startDate = DateUtil.addMonth(new Date(),-12);
  1883 +// Date endDate = DateUtil.addDay(startDate, 18);
  1884 +// System.out.println(getyyyy_MM_dd(startDate));
  1885 +// System.out.println(getyyyy_MM_dd(endDate));
  1886 +// System.out.println(getyyyy_MM_dd(DateUtil.addMonth(endDate,6)));
1886 1887 //
1887 1888 // Date bir = parseYMD("2021-05-29");
1888 1889 // int i = DateUtil.getBabyAgeMonth(bir, new Date());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java View file @ 564b1b3
... ... @@ -718,7 +718,7 @@
718 718 * @param cardNo 身份证号码
719 719 * @return
720 720 */
721   - @RequestMapping(method = RequestMethod.GET, value = "/getWifeHubbyAddress ")
  721 + @RequestMapping(method = RequestMethod.GET, value = "/getWifeHubbyAddress")
722 722 @ResponseBody
723 723 public Map getWifeHubbyAddress(@RequestParam String cardNo) {
724 724 return bookbuildingFacade.getWifeHubbyAddress(cardNo);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 564b1b3
... ... @@ -3522,7 +3522,20 @@
3522 3522 }
3523 3523 babyQuery.setPage(request.getPage());
3524 3524 babyQuery.setLimit(request.getLimit());
3525   - List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
  3525 + List <BabyModel> models = null;
  3526 + if (CollectionUtils.isNotEmpty(babyQuery.getHospitalIdList()) && babyQuery.getHospitalIdList().size() == 1 && "2100001377".equals(babyQuery.getHospitalIdList().get(0)))
  3527 + {
  3528 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "nextDate", Sort.Direction.ASC);
  3529 + }
  3530 + else if (CollectionUtils.isNotEmpty(babyQuery.getHospitalIdList()) && babyQuery.getHospitalIdList().size() == 1 && "2100002261".equals(babyQuery.getHospitalIdList().get(0)))
  3531 + {
  3532 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "birth", Sort.Direction.ASC);
  3533 + }
  3534 + else
  3535 + {
  3536 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
  3537 + }
  3538 +
3526 3539  
3527 3540 return models;
3528 3541 }