From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 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..cb348d7 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);
+
/**
* 鎵ц椤圭洰-鍒嗙被
@@ -40,10 +47,59 @@
Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
/**
+ * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟
+ */
+ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+ Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
* 鎵ц閮ㄤ綅
*/
@PostMapping("/admin/doctor/sale/report/project/body/list")
Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 娴佸け鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/user/list")
+ Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」娴佸け棰勮-椤圭洰
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/project/list")
+ Result lossProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」娴佸け棰勮-钀ラ攢
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/project/market/list")
+ Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 娌荤枟鏍囩浼氬憳鏁伴噺
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+ Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+
+
+
+
+ /**
+ * 鎵ц椤圭洰-SPU鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/project/spu/list")
+ Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓娌荤枟浼氬憳鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/user/list")
+ Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁
@@ -62,7 +118,6 @@
*/
@PostMapping("/admin/doctor/sale/report/user/list")
Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
-
}
--
Gitblit v1.8.0