Merge branch 'master-prod-new' into master-test

Andru

2024-01-02 11fc7fefb11994102fdefc1213cfb0ca5f043f9e

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -2,9 +2,11 @@


import com.hx.resultTool.Result;
import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
import com.hz.his.dto.employee.EmployeeRoleDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,13 @@
     */
    @PostMapping(value = "/emp/detail")
    Result getEmpDetail(@RequestParam("empId") String empId);

    /**
     * 获取员工详情
     * @return Result
     */
    @PostMapping(value = "/emp/detail/byNoOrId")
    Result getEmpDetailByIdOrNo(@RequestBody EmployeeDto employeeDto);

    /**
     * 查询员工列表
@@ -53,4 +62,30 @@
     */
    @PostMapping(value = "/emp/medical/info")
    Result getEmpMedicalInfo(@RequestBody(required = false) String empId);

    /**
     * 判断用户是否存在企业userId,是否存在传递的角色
     */
    @PostMapping(value = "/emp/userId/role/check")
    Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);

    @PostMapping(value = "/emp/role/liset")
    Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);

    /**获取员工-角色列表*/
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);

    @PostMapping(value = "/emp/check/doctor")
    Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);

    @PostMapping(value = "/emp/detail/name")
    Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);

    @PostMapping(value = "/emp/role/get/one")
    Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);

    @PostMapping(value = "/emp/auth/check")
    Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);

}