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/SProjectService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index 029f575..fab86ce 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
@@ -92,4 +93,22 @@
     @PostMapping(value = "/project/sku/spu")
     Result getSkuAndSpu(@RequestParam("projectId") String projectId);
 
+    /**
+     * 鍒ゆ柇鏄惁涓哄尰鐤楅」鐩�
+     * @return Result
+     */
+    @PostMapping(value = "/project/check/medical")
+    Result checkMedicalIitems(@RequestBody ProjectDto projectDto);
+
+    /**
+     * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ椤圭洰鍒楄〃
+     * @param projectDto
+     * @return
+     */
+    @PostMapping(value = "/project/list/by/type")
+    Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+
+    /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
+    @PostMapping(value = "/project/integral/cash/rate")
+    Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0