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/dto/user/UserTreatRecordDto.java | 14 -------
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFddService.java | 11 ++++-
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 40 ++++++++++++++++++++
3 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
new file mode 100644
index 0000000..639b782
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddDto extends PageDto {
+
+ /** 鐢ㄦ埛鏍囪瘑 */
+ private String userId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+
+ /** 绛剧讲妯℃澘ID */
+ private String signTemplateId;
+ /** 绛剧讲浠诲姟妯℃澘鍚嶇О */
+ private String signTemplateName;
+
+ /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
+ private String loginRoleId;
+
+ /** 绛惧悕鍥剧墖璺緞 */
+ private String signImg;
+ /** 鐢ㄦ埛绫诲瀷 */
+ private Integer userType;
+ /** 鍏宠仈鏍囪瘑 */
+ private String commonId;
+
+ /** 閲嶅畾鍚戝湴鍧� */
+ private String redirectUrl;
+ /** 缂栫爜 */
+ private String codeNo;
+
+ /** 浣滃簾鍘熷洜锛岄暱搴︽渶澶�200瀛楃 */
+ private String reason;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java
index c12b604..615e26d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java
@@ -24,19 +24,5 @@
/** 澶勬柟绫诲瀷锛�1:鏅�氬鏂� 2:闈炴櫘閫氬鏂癸級 */
private Integer prescriptionType;
- /** 绛剧讲妯℃澘ID */
- private String signTemplateId;
- /** 绛剧讲浠诲姟妯℃澘鍚嶇О */
- private String signTemplateName;
-
- /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
- private String loginRoleId;
-
- /** 绛惧悕鍥剧墖璺緞 */
- private String signImg;
- /** 鐢ㄦ埛绫诲瀷 */
- private Integer userType;
- /** 鍏宠仈鏍囪瘑 */
- private String commonId;
}
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 60074a7..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,6 +2,7 @@
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;
@@ -19,7 +20,7 @@
/** 鎺堟潈鍏嶉獙璇佺缃� */
@PostMapping(value = "/fdd/authFreeVisa")
- Result authFreeVisa(@RequestBody UserTreatRecordDto dto);
+ Result authFreeVisa(@RequestBody FddDto dto);
/** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
@PostMapping(value = "/fdd/signTemplateList")
@@ -27,11 +28,15 @@
/** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
@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(value="/fdd/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
--
Gitblit v1.8.0