From 74527e7ce6ab1a5e09d3d4936e5157188e983e49 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 二月 2024 16:12:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 4bdf4f6..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,6 +2,7 @@
 
 
 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;
@@ -24,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);
 
     /**
      * 鏌ヨ鍛樺伐鍒楄〃
@@ -64,8 +72,20 @@
     @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