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

fwq

2024-07-08 971eb04d09d950f7fa0d534560a76dd69d84c69c

 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;
@@ -13,7 +15,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "employee")
@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "employee")
public interface SEmployeeService {

    /**
@@ -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);

    /**
     * 查询员工列表
@@ -60,4 +69,23 @@
    @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);

}