From c6b57d91ab6d54f6f46ace728baf80a4ac49fad3 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 15:54:45 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java |   17 +++++++++++++++++
 1 files changed, 17 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 ef01088..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
@@ -65,6 +65,18 @@
     Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
+     * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗗瓙棰勮
+     */
+    @PostMapping("/admin/consultant/report/loss/user/list/numerator")
+    Result lossUserNumeratorList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗘瘝棰勮
+     */
+    @PostMapping("/admin/consultant/report/loss/user/list/denominator")
+    Result lossUserDenominatorList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
      * 鍜ㄨ甯�-鏍稿績椤圭洰
      */
     @PostMapping("/admin/consultant/report/core/project/list")
@@ -82,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);
 
 }

--
Gitblit v1.8.0