From 036b2143b802784ceff0bd0a4ea00a63c9cd8ee8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 14:40:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index 44a831f..88fe124 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -20,18 +20,25 @@
@PostMapping("/admin/doctor/sale/report/deduction/total/list")
Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鍖荤敓-鎵ц涓氱哗鏁版嵁-鍒嗛棬搴�
*/
@PostMapping("/admin/doctor/sale/report/deduction/shop/list")
Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
-
/**
- * 鍖荤敓-鏍稿績椤圭洰
+ * 鍖荤敓-鏍稿績椤圭洰鍗犳瘮鏁版嵁
*/
@PostMapping("/admin/doctor/sale/report/core/project/list")
Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓-鏍稿績椤圭洰涓氱哗杩借釜
+ */
+ @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
+ Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц椤圭洰-鍒嗙被
@@ -39,6 +46,13 @@
@PostMapping("/admin/doctor/sale/report/project/type/list")
Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎵ц椤圭洰-SPU鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/project/spu/list")
+ Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц閮ㄤ綅
*/
@@ -46,6 +60,18 @@
Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);
/**
+ * 娴佸け鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/user/list")
+ Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓娌荤枟浼氬憳鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/user/list")
+ Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
* 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁
*/
@PostMapping("/admin/doctor/sale/report/all/list")
--
Gitblit v1.8.0