fangcheng / regional-platform

Download as
Browse Code »

Commit ff04c7666aa26f0a06424b28e0bec4105b61d42b

Authored by liquanyu
1 parent fdd8c1d8c7
Exists in master and in 1 other branch nobuildprocess

code update

Showing 2 changed files with 10 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ ff04c76
... ... @@ -198,8 +198,7 @@
198 198  
199 199  
200 200 @RequestMapping(value = "/exportChilds", method = RequestMethod.GET)
201   - @ResponseBody
202   -// @TokenRequired
  201 + @TokenRequired
203 202 public void exportChilds(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse,
204 203 @RequestParam(value = "mcardNo", required = false) String mcardNo,
205 204 @RequestParam(value = "bcardNo", required = false) String bcardNo,
... ... @@ -232,7 +231,7 @@
232 231 request.setLimit(limit);
233 232 request.setPage(page);
234 233  
235   - babyBookbuildingFacade.exportChilds(request,1,httpServletResponse);
  234 + babyBookbuildingFacade.exportChilds(request,loginState.getId(),httpServletResponse);
236 235 }
237 236  
238 237  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ff04c76
... ... @@ -1728,15 +1728,15 @@
1728 1728  
1729 1729 public void exportChilds(BabyManageRequest request, Integer userId, HttpServletResponse httpServletResponse) {
1730 1730 try {
1731   - String hospitalId = "196";
  1731 + String hospitalId = "";
1732 1732 //得到当前登录的医院id
1733   -// if (userId != null)
1734   -// {
1735   -// Users dbuser = usersService.getUsers(userId);
1736   -// if (dbuser != null) {
1737   -// hospitalId = String.valueOf(dbuser.getOrgId());
1738   -// }
1739   -// }
  1733 + if (userId != null)
  1734 + {
  1735 + Users dbuser = usersService.getUsers(userId);
  1736 + if (dbuser != null) {
  1737 + hospitalId = String.valueOf(dbuser.getOrgId());
  1738 + }
  1739 + }
1740 1740 List<Map<String,Object>> datas = new ArrayList<>();
1741 1741 BabyModelQuery babyQuery = new BabyModelQuery();
1742 1742 babyQuery.setHospitalId(String.valueOf(hospitalId));