From 919539e75904ef64d2bf9add96f89691d81930a2 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 03 十一月 2023 18:47:44 +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 | 50 ++++++++++++++++++++++++++++++++++++--------------
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java | 6 ++++++
2 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
index bd0b606..ef698c9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -30,4 +30,10 @@
*/
@PostMapping(value = "/employee/search/acquisition/link")
Result searchAcquisitionLink(@RequestBody EmployeeDto employeeDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-浼佷笟寰俊鍙戦�侀偖浠堕�氱煡
+ */
+ @PostMapping(value = "/employee/sent/email/notice")
+ Result senEmailNotice(@RequestBody EmployeeDto employeeDto);
}
\ No newline at end of file
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..7b91cfa 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
@@ -60,18 +60,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 +71,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