From 20c86767e4adeea95a131c8f5f8f7d29a67f83f7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 26 十二月 2023 17:34:32 +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 | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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 9cbdffb..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
@@ -15,6 +15,12 @@
public interface BiDoctorSaleService {
/**
+ * 鍖荤敓-涓氱哗鏁版嵁瀵煎嚭
+ */
+ @PostMapping("/admin/doctor/sale/report/total/data/export")
+ Result totalDataExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
* 鍖荤敓-涓氱哗鎬诲垪琛�
*/
@PostMapping("/admin/doctor/sale/report/deduction/total/list")
@@ -60,18 +66,6 @@
/**
- * 浼氬憳娌荤枟鎯呭喌鎬昏〃
- */
- @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/type/permeate/list")
@@ -83,14 +77,48 @@
@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);
-
-
--
Gitblit v1.8.0