From 7e80bb0a3bb2247fb519e00722b76145456981df Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 19:01:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java |   25 +++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java               |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
new file mode 100644
index 0000000..ff0710c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -0,0 +1,33 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒掓墸
+ **/
+@Data
+public class DeductionSurfaceDto extends BaseQueryVo{
+    /**寮�鍗曞紑濮嬫椂闂�*/
+    private Date startTime;
+    /**寮�鍗曠粨鏉熸椂闂�*/
+    private Date endTime;
+    /**璁㈠崟鍙�*/
+    private String orderNo;
+    /**鎵�灞為棬搴�*/
+    private String shopId;
+    /**鎵�灞炲挩璇㈠笀*/
+    private String hisCorpName;
+    /**鐘舵��:0鍙栨秷1杩囨湡2鏃犳晥3鍒掓墸瀹屾垚4鏈垝鎵�5鍒掓墸涓�*/
+    private Integer dStatus;
+    /**椤圭洰鍒嗙被*/
+    private String typeId;
+
+    /*******淇濆瓨鍙傛暟********/
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜�*/
+    private String operatorName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
new file mode 100644
index 0000000..17fc49a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ClinicPerfReqDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 鍒掓墸
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-deduction-surface")
+public interface BiDeductionService {
+
+    /**
+     * 鏈墽琛屾槑缁嗗垪琛�
+     */
+    @PostMapping("/deduction/surface/list")
+    Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+
+
+}

--
Gitblit v1.8.0