From e1972e6d92e6b57ecb65eb7998606e620d9f6811 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 17:22:39 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
index b361acf..30a3ff8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
@@ -25,9 +25,43 @@
      * 鍖荤敓鎵ц涓氱哗鏁版嵁
      */
     @PostMapping("/admin/project/relation/report/doctor/list")
-    Result deductionDoctorList(@RequestBody AppointmentVisitVo appointmentVisitVo);
+    Result deductionDoctorList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 浜у搧閮�-鎵ц涓氱哗鏁版嵁
+     */
+    @PostMapping("/admin/project/relation/report/department/cp/list")
+    Result deductionCpList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 -2.0鐗堟湰
+     */
+    @PostMapping("/admin/project/relation/report/department/zs/list/V2")
+    Result deductionZsListV2(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 - 2.0搴熷純
+     */
+    @PostMapping("/admin/project/relation/report/department/zs/list")
+    Result deductionZsList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 鍐嶇敓閮�-娓楅�忎笟缁╂暟鎹� - 2.0搴熷純
+     */
+    @PostMapping("/admin/project/relation/report/department/zs/permeate/list")
+    Result deductionZsPermeateList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 澧為暱閮�-鍖荤敓绉佸煙缇ゆ暟鎹�-娓楅�忎笟缁�
+     */
+    @PostMapping("/admin/group/report/zs/doctor/list")
+    Result deductionZsDoctorList(@RequestBody ShopReportDto shopReportDto);
 
 
-
+    /**
+     * 鍖荤敓鎵ц涓氱哗鏁版嵁-鍚湇鍔¢棬搴楁寚鏍�
+     */
+    @PostMapping("/admin/project/relation/report/doctor/target/list")
+    Result deductionDoctorTargetList(@RequestBody ShopReportDto shopReportDto);
 
 }

--
Gitblit v1.8.0