diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index bee4d6d..e8e2814 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1709,6 +1709,15 @@ public class TestController extends BaseController { } + @RequestMapping("/currentCheckBabyList") + @ResponseBody + @TokenRequired + public Object currentCheckBabyList(HttpServletRequest request){ + + return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request)); + } + + @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 751e87f..a86a05f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1746,4 +1746,57 @@ public class BabyCheckFacade { } return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + + public List> getCurrentDayCheckBabies(Integer userId) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + List> babyList = new ArrayList<>(); + + Date currentDay = DateUtil.parseYMD(DateUtil.getymd()); + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setHospitalId(hospitalId); + query.setYn(YnEnums.YES.getId()); + query.setCheckDateStart(currentDay); + query.setCheckDateEnd(currentDay); + + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setYn(YnEnums.YES.getId()); + + List babyCheckList = babyCheckService.queryBabyCheckRecord(query); + List babyModels = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyCheckList)) + { + for (BabyCheckModel babyCheck : babyCheckList) + { + String buildId = babyCheck.getBuildId(); + if (StringUtils.isNotEmpty(buildId)) + { + babyQuery.setId(buildId); + List babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + babyModels.addAll(babyResult); + } + } + } + + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel baby : babyModels) + { + Map babyMap = new HashMap<>(); + babyMap.put("id",baby.getId()); + babyMap.put("name",baby.getName()); + babyMap.put("birth",DateUtil.getyyyy_MM_dd(baby.getBirth())); + babyMap.put("monthName",baby.getMname()); + babyMap.put("monthPhone",baby.getMphone()); + babyMap.put("mcardNo",baby.getMcertNo()); + babyMap.put("mcertTypeId",baby.getMcertTypeId()); + babyMap.put("vcCardNo",baby.getVcCardNo()); + babyList.add(babyMap); + } + } + + return babyList; + } + } \ No newline at end of file