From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
index 8f369c4..98418a3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -16,6 +16,9 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd-sign-task")
public interface SPhipFddSignTaskService {
+ /** 鑾峰彇绛剧讲闂ㄥ簵淇℃伅 */
+ @PostMapping(value = "/fdd/sign/task/getSignShop")
+ Result getSignShop(@RequestBody FddDto dto);
/** 鍙戣捣妯℃澘绛剧讲浠诲姟 */
@PostMapping(value = "/fdd/sign/task/template/signTask")
@@ -27,20 +30,40 @@
/** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
@RequestMapping(value="/fdd/sign/task/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
- , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
+ Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
/** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
- @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("redirectUrl")String redirectUrl);
+ @RequestMapping(value="/fdd/sign/task/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
- /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
- @RequestMapping("/fdd/sign/task/cancelSignTask")
- Result cancelSignTask(@RequestBody FddDto dto);
+ /** 鏂板鏂囨。绛剧讲浠诲姟鍙備笌浜� */
+ @RequestMapping("/fdd/sign/task/addDocSignTaskActor")
+ Result addDocSignTaskActor(@RequestBody FddDto dto);
+
+ /** 鎾ら攢绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/cancel")
+ Result cancel(@RequestBody FddDto dto);
+
+ /** 浣滃簾绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/abolish")
+ Result abolish(@RequestBody FddDto dto);
+
+ /** 瀹屾垚绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/finish")
+ Result finish(@RequestBody FddDto dto);
/** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
@PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")
Result getSignTaskFileUrl(@RequestBody FddDto dto);
+ /** 鏌ヨ绛剧讲瀹屾垚鐨勬枃浠� */
+ @PostMapping(value = "/fdd/sign/task/signTaskGetFile")
+ Result signTaskGetFile(@RequestBody FddDto dto);
+
+ /** 绛剧讲浠诲姟璇︽儏 - 娉曞ぇ澶� */
+ @PostMapping(value = "/fdd/sign/task/detail/fdd")
+ Result detailFdd(@RequestBody FddDto dto);
+
+
+
}
--
Gitblit v1.8.0