From 6916fa719c08411cd70f8e96514eeca129274689 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 06 三月 2024 19:03:07 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java
index cd8ee26..38bd82c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java
@@ -18,6 +18,14 @@
 @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd")
 public interface SPhipFddService {
 
+    /** 鏌ヨ鐢ㄦ埛娉曞ぇ澶у姛鑳芥巿鏉冩暟鎹� */
+    @PostMapping(value = "/fdd/userFddAuthData")
+    Result userFddAuthData(@RequestBody FddDto dto);
+
+    /** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
+    @PostMapping(value = "/fdd/authUrl")
+    Result fddAuthUrl(@RequestBody FddDto dto);
+
     /** 鎺堟潈鍏嶉獙璇佺缃� */
     @PostMapping(value = "/fdd/authFreeVisa")
     Result authFreeVisa(@RequestBody FddDto dto);
@@ -25,10 +33,6 @@
     /** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
     @PostMapping(value = "/fdd/signTemplateList")
     Result signTemplateList(@RequestBody PageDto dto);
-
-    /** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
-    @PostMapping(value = "/fdd/authUrl")
-    Result fddAuthUrl(@RequestBody FddDto dto);
 
     /** 鍙戣捣娌荤枟鍚屾剰涔︾缃蹭换鍔� */
     @PostMapping(value = "/fdd/template/signTask")
@@ -41,12 +45,12 @@
     /** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
     @RequestMapping(value="/fdd/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
-            , @RequestParam("loginRoleId") String loginRoleId);
+            , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
 
     /** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
     @RequestMapping(value="/fdd/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
-            , @RequestParam("loginRoleId") String loginRoleId);
+            , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
 
 
 }

--
Gitblit v1.8.0