From 607dd05591843f0691a3e38fbb2c790a99c13f09 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 12 十月 2023 15:38:59 +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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 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..a72b3ee 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,13 +46,48 @@
@PostMapping("/admin/doctor/sale/report/project/type/list")
Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟
+ */
+ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+ Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
/**
- * 鎵ц椤圭洰-SPU鍗犳瘮
+ * 娌荤枟鏍囩浼氬憳鏁伴噺
*/
- @PostMapping("/admin/doctor/sale/report/project/spu/list")
- Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+ Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/detail/list")
+ Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/project/items/list")
+ Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍒嗙被娌荤枟娓楅�忔儏鍐�
+ */
+ @PostMapping("/admin/doctor/sale/report/type/permeate/list")
+ Result typePermeateList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎵ц椤圭洰-鑱斿悎澶氶」鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/project/therapy/multiple")
+ Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+
+
+ /*******************************涓嬮潰鎺ュ彛2.0搴熷純*********************************/
/**
* 鎵ц閮ㄤ綅
*/
@@ -64,6 +99,24 @@
*/
@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);
+
+ /**
+ * 鎵ц椤圭洰-SPU鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/project/spu/list")
+ Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍖荤敓娌荤枟浼氬憳鎯呭喌
@@ -88,7 +141,6 @@
*/
@PostMapping("/admin/doctor/sale/report/user/list")
Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
-
}
--
Gitblit v1.8.0