From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 9462bd1..61231e3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/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);
 
     /**
      * 鏌ヨ鍛樺伐鍒楄〃
@@ -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);
+
 }

--
Gitblit v1.8.0