From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
index 92e957e..d680359 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
@@ -1,28 +1,32 @@
 package com.hz.his.feign.service.platform;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hx.resultTool.Result;
-import com.hz.his.dto.card.CardQueryDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-treat")
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-treat")
 public interface SPhipTreatService {
 
     /**
      * 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曡鎯�
+     * @param treatSingleId String绫诲瀷JsonObject
      */
-    @PostMapping(value = "/treat/confirmTreatNotice")
-    Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId);
+    @PostMapping(value = "/treat/info")
+    Result getTreatInfo(@RequestBody String treatSingleId);
 
     /**
      * 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曠‘璁�
+     * @param treatSingleId String绫诲瀷JsonObject
      */
     @PostMapping(value = "/treat/confirmTreatNotice")
-    Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId);
+    Result confirmTreat(@RequestBody String treatSingleId);
 
+    /** 鎵归噺鍒涘缓娌荤枟鍗� */
+    @PostMapping(value = "/treat/batch/add")
+    Result batchAdd(@RequestBody JSONObject dataJson);
 }
\ No newline at end of file

--
Gitblit v1.8.0