|
@@ -32,9 +32,9 @@ public class ReportStaticController {
|
|
|
|
|
|
|
|
@UserLoginToken
|
|
@UserLoginToken
|
|
|
@RequestMapping(value = "/selectDoctorIndexData", method = {RequestMethod.GET, RequestMethod.POST})
|
|
@RequestMapping(value = "/selectDoctorIndexData", method = {RequestMethod.GET, RequestMethod.POST})
|
|
|
- public R selectDoctorIndexData(@RequestBody ReportVo vo, HttpServletRequest httpServletRequest){
|
|
|
|
|
|
|
+ public R selectDoctorIndexData(@RequestBody ReportVo vo){
|
|
|
AssertUtil.anyIsNotBlank("报表id为空,查询报表数据失败",vo.getReportId(),vo.getReportIds());
|
|
AssertUtil.anyIsNotBlank("报表id为空,查询报表数据失败",vo.getReportId(),vo.getReportIds());
|
|
|
- User user = TokenUtil.getNewUser(httpServletRequest);
|
|
|
|
|
|
|
+ User user = TokenUtil.getUser();
|
|
|
vo.setDoctorId(user.getUserIdCode());
|
|
vo.setDoctorId(user.getUserIdCode());
|
|
|
Map<String, Object> map = reportStaticService.selectDoctorIndexData(vo);
|
|
Map<String, Object> map = reportStaticService.selectDoctorIndexData(vo);
|
|
|
return R.ok("查询报表数据成功").put("data",map);
|
|
return R.ok("查询报表数据成功").put("data",map);
|