diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index 2788b44..daa1022 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -198,8 +198,7 @@ public class BabyBookbuildingController extends BaseController { @RequestMapping(value = "/exportChilds", method = RequestMethod.GET) - @ResponseBody -// @TokenRequired + @TokenRequired public void exportChilds(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse, @RequestParam(value = "mcardNo", required = false) String mcardNo, @RequestParam(value = "bcardNo", required = false) String bcardNo, @@ -232,7 +231,7 @@ public class BabyBookbuildingController extends BaseController { request.setLimit(limit); request.setPage(page); - babyBookbuildingFacade.exportChilds(request,1,httpServletResponse); + babyBookbuildingFacade.exportChilds(request,loginState.getId(),httpServletResponse); } 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 e43526d..9cadfab 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 @@ -1728,15 +1728,15 @@ public class BabyBookbuildingFacade { public void exportChilds(BabyManageRequest request, Integer userId, HttpServletResponse httpServletResponse) { try { - String hospitalId = "196"; + String hospitalId = ""; //得到当前登录的医院id -// if (userId != null) -// { -// Users dbuser = usersService.getUsers(userId); -// if (dbuser != null) { -// hospitalId = String.valueOf(dbuser.getOrgId()); -// } -// } + if (userId != null) + { + Users dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } List> datas = new ArrayList<>(); BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setHospitalId(String.valueOf(hospitalId));