From 971eb04d09d950f7fa0d534560a76dd69d84c69c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index c48d119..502e0a5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -3,6 +3,7 @@
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
 import com.hz.his.dto.label.LabelTypePageDto;
+import com.hz.his.vo.label.LabelFindVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -10,7 +11,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "label")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "label")
 public interface SLabelService {
 
 
@@ -28,4 +29,19 @@
     @PostMapping(value = "/label/info/list")
     Result getLabelInfoList(@RequestBody(required = false)PageDto pageDto);
 
+
+    /**
+     * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛撅紙鏍规嵁鑼冨洿鑾峰彇锛�
+     * @return Result鐨刣ata杞垚LabelTypeVo鐨勯泦鍚�
+     */
+    @PostMapping(value = "/label/type/tree/by-label")
+    Result getLabelTypeTreeByLabel(@RequestBody LabelFindVo labelFindVo);
+
+    /**鏍规嵁鑼冨洿鑾峰彇
+     * 鑾峰彇鐢ㄦ埛鏍囩
+     * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+     */
+    @PostMapping(value = "/label/user/label")
+    Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
+
 }

--
Gitblit v1.8.0