From 1582bc641c8d00ad0d1b91ac3c4c24faa73fc35b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 16 Nov 2020 18:04:13 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
index d694ad8..728e7e6 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -52,7 +52,7 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult<SysDoctorVo> list(@RequestParam Map<String, Object> params,@LoginUser SysUser user) {
+ public PageResult<SysDoctorDto> list(@RequestParam Map<String, Object> params,@LoginUser SysUser user) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
@@ -69,6 +69,14 @@
public ResultBody findById(@PathVariable Long id) {
SysDoctor model = sysDoctorService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
+ }
+ /**
+ * 判断用户名是否管理员
+ */
+ @ApiOperation(value = "判断用户名是否管理员")
+ @GetMapping("/userName")
+ public ResultBody findById(@RequestParam String userName) {
+ return sysDoctorService.userIsAdmin(userName);
}
/**
* 根据 Map 查询
@@ -102,14 +110,7 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
-
- if(v) {
- return ResultBody.ok().data(sysDoctor).msg("保存成功");
- }
- else {
- return ResultBody.failed().msg("保存失败");
- }
+ return sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
}
}
@@ -142,10 +143,25 @@
/**
* 设为管理
*/
- @ApiOperation(value = "修改状态")
+ @ApiOperation(value = "设为管理员")
@PostMapping("setadmin")
public ResultBody setAdmin(@RequestBody Map<String, Object> params) {
return sysDoctorService.setAdminDoctor(params);
}
-
+ /**
+ * 统计医生的数量
+ * @param datatype 业务类型
+ * 0 自注册医生
+ * 1 签约医生
+ * 2 医答医生
+ * 3 C端医生
+ * 4 H端医生
+ * @return
+ */
+ @ApiOperation(value = "统计医生的数量")
+ @GetMapping("chartDoctor")
+ public ResultBody chartDoctor(int datatype) {
+ int counts= sysDoctorService.chartDoctor(datatype);
+ return ResultBody.ok().data(counts).msg("数据获取成功");
+ }
}
--
Gitblit v1.8.0