From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 8fd0904..3dbd0af 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
@@ -94,12 +94,32 @@
      */
     @PostMapping("/admin/doctor/sale/report/project/items/list/V2")
     Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 閲嶇偣鍝侀」鏁版嵁-鎷嗗垎涓夊ぇ椤圭洰
+     */
+    @PostMapping("/admin/doctor/sale/report/project/items/list/V3")
+    Result projectItemListV3(@RequestBody EmployeeReportDto employeeReportDto);
+
     /**
      * 瀹㈡埛棰勭害鍒拌鎯呭喌
      */
     @PostMapping("/admin/doctor/sale/report/appoint/list/V2")
     Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**
+     * 涓夊ぇ椤圭洰鎵ц涓氱哗
+     */
+    @PostMapping("/admin/doctor/sale/report/relation/project/list")
+    Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+    /**
+     * 鏈嶅姟闂ㄥ簵鎵ц鎸囨爣涓氱哗
+     */
+    @PostMapping("/admin/doctor/sale/report/shop/target/list")
+    Result shopTargetList(@RequestBody EmployeeReportDto employeeReportDto);
+
 
 
     /*******************************涓嬮潰鎺ュ彛3.0搴熷純*********************************/

--
Gitblit v1.8.0