新增添加医生

api/controller/department.go

@@ -29,7 +29,28 @@ func (b *Department) GetDepartmentCustomList(c *gin.Context) {
 
 	hospitalDepartmentCustomDao := dao.HospitalDepartmentCustom{}
 
-	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(departmentRequest.GetDepartmentCustomList)
+	maps := make(map[string]interface{})
+	if departmentRequest.DepartmentId != "" {
+		maps["department_id"] = departmentRequest.DepartmentId
+	}
+
+	if departmentRequest.DepartmentCustomName != "" {
+		maps["department_custom_name"] = departmentRequest.DepartmentCustomName
+	}
+
+	if departmentRequest.DepartmentName != "" {
+		maps["department_name"] = departmentRequest.DepartmentName
+	}
+
+	if departmentRequest.DepartmentCode != "" {
+		maps["department_code"] = departmentRequest.DepartmentCode
+	}
+
+	if departmentRequest.DepartmentStatus != 0 {
+		maps["department_status"] = departmentRequest.DepartmentStatus
+	}
+
+	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(maps)
 	if err != nil {
 		responses.Ok(c)
 		return

api/controller/userDoctor.go

@@ -136,9 +136,18 @@ func (r *UserDoctor) AddUserDoctor(c *gin.Context) {
 		return
 	}
 
+	// 获取当前登陆用户id
+	userId := c.GetInt64("UserId")
+	if userId == 0 {
+		responses.FailWithMessage("角色错误", c)
+		return
+	}
+
+	userIdStr := strconv.FormatInt(userId, 10)
+
 	// 业务处理
 	userDoctorService := service.UserDoctorService{}
-	_, err := userDoctorService.AddUserDoctor(userDoctorRequest.AddUserDoctor)
+	_, err := userDoctorService.AddUserDoctor(userIdStr, userDoctorRequest.AddUserDoctor)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
@@ -146,3 +155,44 @@ func (r *UserDoctor) AddUserDoctor(c *gin.Context) {
 
 	responses.Ok(c)
 }
+
+// GetUserDoctorPendingPage 获取医生待审核列表-分页
+func (r *UserDoctor) GetUserDoctorPendingPage(c *gin.Context) {
+	userDoctorRequest := requests.UserDoctorRequest{}
+	if err := c.ShouldBind(&userDoctorRequest.GetUserDoctorPendingPage); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(userDoctorRequest.GetUserDoctorPendingPage); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	if userDoctorRequest.GetUserDoctorPendingPage.Page == 0 {
+		userDoctorRequest.GetUserDoctorPendingPage.Page = 1
+	}
+
+	if userDoctorRequest.GetUserDoctorPendingPage.PageSize == 0 {
+		userDoctorRequest.GetUserDoctorPendingPage.PageSize = 20
+	}
+
+	userDoctorDao := dao.UserDoctorDao{}
+	userDoctor, total, err := userDoctorDao.GetUserDoctorDaoPageSearch(userDoctorRequest.GetUserDoctorPage, userDoctorRequest.GetUserDoctorPage.Page, userDoctorRequest.GetUserDoctorPage.PageSize)
+
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 处理返回值
+	getUserDoctorPageResponses := userDoctorResponse.GetUserDoctorPageResponse(userDoctor)
+
+	result := make(map[string]interface{})
+	result["page"] = userDoctorRequest.GetUserDoctorPage.Page
+	result["page_size"] = userDoctorRequest.GetUserDoctorPage.PageSize
+	result["total"] = total
+	result["data"] = getUserDoctorPageResponses
+	responses.OkWithData(result, c)
+}