diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index a466f54..3b90f7a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1877,12 +1877,13 @@ public class DateUtil { public static void main(String[] args) { + System.out.println(getBabyMonthAge(parseYMD("2022-06-15"),new Date())); - Date startDate = DateUtil.addMonth(new Date(),-12); - Date endDate = DateUtil.addDay(startDate, 18); - System.out.println(getyyyy_MM_dd(startDate)); - System.out.println(getyyyy_MM_dd(endDate)); - System.out.println(getyyyy_MM_dd(DateUtil.addMonth(endDate,6))); +// Date startDate = DateUtil.addMonth(new Date(),-12); +// Date endDate = DateUtil.addDay(startDate, 18); +// System.out.println(getyyyy_MM_dd(startDate)); +// System.out.println(getyyyy_MM_dd(endDate)); +// System.out.println(getyyyy_MM_dd(DateUtil.addMonth(endDate,6))); // // Date bir = parseYMD("2021-05-29"); // int i = DateUtil.getBabyAgeMonth(bir, new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 0f39ab2..b02d261 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -718,7 +718,7 @@ public class PregnantBuildController extends BaseController { * @param cardNo 身份证号码 * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/getWifeHubbyAddress ") + @RequestMapping(method = RequestMethod.GET, value = "/getWifeHubbyAddress") @ResponseBody public Map getWifeHubbyAddress(@RequestParam String cardNo) { return bookbuildingFacade.getWifeHubbyAddress(cardNo); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6527e1f..3fe329e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -3522,7 +3522,20 @@ public class BabyBookbuildingFacade { } babyQuery.setPage(request.getPage()); babyQuery.setLimit(request.getLimit()); - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); + List models = null; + if (CollectionUtils.isNotEmpty(babyQuery.getHospitalIdList()) && babyQuery.getHospitalIdList().size() == 1 && "2100001377".equals(babyQuery.getHospitalIdList().get(0))) + { + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "nextDate", Sort.Direction.ASC); + } + else if (CollectionUtils.isNotEmpty(babyQuery.getHospitalIdList()) && babyQuery.getHospitalIdList().size() == 1 && "2100002261".equals(babyQuery.getHospitalIdList().get(0))) + { + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "birth", Sort.Direction.ASC); + } + else + { + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); + } + return models; }