From 88b7bbeb15ed4be555d41e98cbd0b8d2868609de Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 09 七月 2024 20:59:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionIndicationDto.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java | 2 +-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java | 21 +++++++++++++++++++++
4 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index e251019..b65cdc7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -148,6 +148,9 @@
//浣滃簾鍒掓墸鍘熷洜
private String invalidReason;
+ //閫傚簲鐥�
+ private List<DeductionIndicationDto> indicationList;
+
public DeductionDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionIndicationDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionIndicationDto.java
new file mode 100644
index 0000000..e5f3caa
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionIndicationDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.deduction;
+
+import lombok.Data;
+
+/**
+ * 鍒掓墸椤圭洰閫傚簲鐥�
+ */
+@Data
+public class DeductionIndicationDto {
+ /**鍒掓墸椤圭洰娓呭崟鏍囪瘑*/
+ private String deductionSingleId;
+ /**鍒掓墸椤圭洰鏍囪瘑*/
+ private String deductionProjectId;
+ /**閫傚簲鐥囨爣璇�*/
+ private String indicationId;
+ /**閫傚簲鐥囧悕绉�*/
+ private String indication;
+ /**閫傚簲鐥囧叧鑱斿垎绫籎SON瀛楃*/
+ private String typeJson;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
index 17a2273..f0bf997 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
@@ -9,7 +9,7 @@
/**
* @author CJH
**/
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "read-appointment")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "read-appointment")
public interface SAppointmentService {
/** 鑾峰彇鐢ㄦ埛鏃堕棿鍐呴绾︾殑椤圭洰 */
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java
new file mode 100644
index 0000000..a733d7d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSystemParameterService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "systemParameter")
+public interface SSystemParameterService {
+
+ /**
+ * 鑾峰彇閰嶇疆
+ * @param paramName 閰嶇疆鍚嶇О
+ * @return
+ */
+ @PostMapping(value = "/system/parameter/get")
+ Result getSystemParameterByNAME(@RequestParam("paramName") String paramName);
+}
--
Gitblit v1.8.0