From ed7c2dd7867f6819c7ddb180b60825c76faf5a22 Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期三, 18 十月 2023 17:17:40 +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     |    7 +++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index c484ce3..a1f2a13 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -120,5 +120,8 @@
     @PostMapping("/admin/consultant/report/first/user/rate/export")
     Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**鍜ㄨ甯�-寰俊鑱婂ぉ鎬绘暟鍙婄兢鑱婃暟閲�*/
+    @PostMapping("/admin/consultant/report/consultant/chat/data")
+    Result consultantWeChatData(@RequestBody EmployeeReportDto employeeReportDto);
 
 }
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 a72b3ee..9cbdffb 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
@@ -84,6 +84,13 @@
     Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);
 
 
+    /**
+     * 瀹㈡埛棰勭害鎯呭喌
+     */
+    @PostMapping("/admin/doctor/sale/report/appoint/list")
+    Result appointList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
 
 
 

--
Gitblit v1.8.0