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 | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 88fe124..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
@@ -46,12 +46,12 @@
@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);
+ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+ Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц閮ㄤ綅
@@ -64,6 +64,36 @@
*/
@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);
/**
* 鍖荤敓娌荤枟浼氬憳鎯呭喌
@@ -88,7 +118,6 @@
*/
@PostMapping("/admin/doctor/sale/report/user/list")
Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
-
}
--
Gitblit v1.8.0