From 847eaf90f96dd689010c54eafa073d448b1d56ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 六月 2023 10:06:49 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java | 24 ++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java | 3 +++
3 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java
new file mode 100644
index 0000000..04f790f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.CashierSettlementDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 鏀堕摱鏄庣粏
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-cashier-detail")
+public interface BiCashierDetailService {
+
+ /**
+ * 鍑虹撼缁撶畻鍒楄〃
+ */
+ @PostMapping("/cashier/detail/common/list")
+ Result cashierDetailList(@RequestBody CashierSettlementDto cashierSettlementDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
index f8f0c55..d4d71a6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java
@@ -38,7 +38,9 @@
@PostMapping("/admin/clinic/perf/cashierDetailList")
Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto);
-
+ /** 瀵煎嚭 - 鏀堕摱璇︾粏鍒楄〃 */
+ @PostMapping("/admin/clinic/perf/exportCashierDetail")
+ Result exportCashierDetail(@RequestBody ClinicPerfReqDto reqDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
index 1b090b0..1733ef0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantCashService.java
@@ -32,5 +32,8 @@
@PostMapping("/report/consultant/cash/total/list")
Result totalList(@RequestBody ConsultantCashReportDto dto);
+ /** 瀵煎嚭 - 鍜ㄨ甯堢幇閲戜笟缁� */
+ @PostMapping("/report/consultant/cash/export")
+ Result export(@RequestBody ConsultantCashReportDto dto);
}
--
Gitblit v1.8.0