From f34551ff1b056a39b2581581a3de7931ceb88d2a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 29 八月 2023 14:29:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 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 481605a..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
@@ -54,12 +54,6 @@
 
 
     /**
-     * 鎵ц椤圭洰-SPU鍗犳瘮
-     */
-    @PostMapping("/admin/doctor/sale/report/project/spu/list")
-    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
-
-    /**
      * 鎵ц閮ㄤ綅
      */
     @PostMapping("/admin/doctor/sale/report/project/body/list")
@@ -70,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);
 
     /**
      * 鍖荤敓娌荤枟浼氬憳鎯呭喌
@@ -94,7 +118,6 @@
      */
     @PostMapping("/admin/doctor/sale/report/user/list")
     Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
-
 
 
 }

--
Gitblit v1.8.0