From 0a21e1e41addd1800f5f0e177f5a28e8ba68c39a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 06 三月 2024 16:01:06 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 bad067a..cd8ee26 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
@@ -2,12 +2,12 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
import com.hz.his.dto.marketing.MarketActivityDto;
import com.hz.his.dto.user.UserTreatRecordDto;
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.RequestMapping;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -18,25 +18,35 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd")
public interface SPhipFddService {
+ /** 鎺堟潈鍏嶉獙璇佺缃� */
+ @PostMapping(value = "/fdd/authFreeVisa")
+ Result authFreeVisa(@RequestBody FddDto dto);
+
/** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
@PostMapping(value = "/fdd/signTemplateList")
Result signTemplateList(@RequestBody PageDto dto);
/** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
@PostMapping(value = "/fdd/authUrl")
- Result fddAuthUrl(@RequestBody UserTreatRecordDto dto);
+ Result fddAuthUrl(@RequestBody FddDto dto);
/** 鍙戣捣娌荤枟鍚屾剰涔︾缃蹭换鍔� */
@PostMapping(value = "/fdd/template/signTask")
- Result templateSignTask(@RequestBody UserTreatRecordDto dto);
+ Result templateSignTask(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛剧讲浠诲姟鍙備笌浜洪摼鎺� to codeNo */
+ @PostMapping(value = "/fdd/getSignTaskActorUrlToCodeNo")
+ Result getSignTaskActorUrlToCodeNo(@RequestBody FddDto dto);
/** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
- @RequestMapping("/fdd/medicalRecords/signTask")
- Result medicalRecordsSignTask(MultipartFile file, String id, String loginRoleId);
+ @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);
/** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
- @RequestMapping("/fdd/prescription/signTask")
- Result prescriptionSignTask(MultipartFile file, String id, String loginRoleId);
+ @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);
}
--
Gitblit v1.8.0