From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +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 | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 428a4bb..c640347 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 鏄姹傛帴鍙ｅ墠缂�
@@ -78,10 +79,33 @@
Result getUpdateSpuProject(@RequestBody ProjectDto projectDto);
/**
- * 鑾峰彇椤圭洰spu瑙勬牸鍒楄〃(鍚屾浣跨敤)
+ * 鑾峰彇褰撳墠椤圭洰sku瑙勬牸鍜屽叾spu瑙勬牸(鍚屾浣跨敤)
* @return Result
+ * 杩斿洖浣跨敤SpecDt
*/
@PostMapping(value = "/project/page/spu/spec/update")
- Result getUpdateSpuSpecProject(@RequestParam("hisId") String hisId);
+ Result getUpdateSpuSpecProject(@RequestParam("projectId") String projectId);
+
+ /**
+ * 鑾峰彇褰撳墠椤圭洰sku鍜屽搴旂殑spu淇℃伅
+ * @return Result
+ */
+ @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);
}
\ No newline at end of file
--
Gitblit v1.8.0