From 652cd55292820c71b5e96537c454cb225cd54e96 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 28 六月 2023 16:41:36 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index e918438..85d552e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -94,5 +94,10 @@
@PostMapping("/admin/consultant/report/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃-鏈堢粺璁�
+ */
+ @PostMapping("/admin/consultant/report/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index 908aac6..2f55d29 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -83,4 +83,10 @@
@PostMapping("/admin/export/shop/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌-鏈堢粺璁�
+ */
+ @PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+
}
--
Gitblit v1.8.0