From d966574e1c35a3511f87ffd8f819ac5ebbe117ab Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 12 三月 2024 10:37:31 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java |  121 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 117 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 b49122c..8fd0904 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
@@ -11,8 +11,14 @@
  * 鍖荤敓蹇姤
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf")
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf-sale")
 public interface BiDoctorSaleService {
+
+    /**
+     * 鍖荤敓-涓氱哗鏁版嵁瀵煎嚭
+     */
+    @PostMapping("/admin/doctor/sale/report/total/data/export")
+    Result totalDataExport(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍖荤敓-涓氱哗鎬诲垪琛�
@@ -20,18 +26,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 +53,111 @@
     Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
+     * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟
+     */
+    @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+    Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 娌荤枟鏍囩浼氬憳鏁伴噺
+     */
+    @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+    Result treatLabelInfoList(@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);
+
+    /**
+     * 鍖荤敓鍒濆璇婄畝鎶�
+     */
+    @PostMapping("/admin/doctor/sale/report/first/treat/list")
+    Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+     */
+    @PostMapping("/admin/doctor/sale/report/treat/detail/list/V2")
+    Result treatDetailListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 閲嶇偣鍝侀」鏁版嵁
+     */
+    @PostMapping("/admin/doctor/sale/report/project/items/list/V2")
+    Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto);
+    /**
+     * 瀹㈡埛棰勭害鍒拌鎯呭喌
+     */
+    @PostMapping("/admin/doctor/sale/report/appoint/list/V2")
+    Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+    /*******************************涓嬮潰鎺ュ彛3.0搴熷純*********************************/
+    /**
+     * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+     */
+    @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/appoint/list")
+    Result appointList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+    /*******************************涓嬮潰鎺ュ彛2.0搴熷純*********************************/
+    /**
      * 鎵ц閮ㄤ綅
      */
     @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);
+
+    /**
+     * 鎵ц椤圭洰-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 +176,6 @@
      */
     @PostMapping("/admin/doctor/sale/report/user/list")
     Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
-
 
 
 }

--
Gitblit v1.8.0