From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 3a6f609..7a314d6 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
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.AppointmentVisitVo;
+import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,13 +35,19 @@
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);
@@ -51,5 +58,16 @@
@PostMapping("/admin/group/report/zs/doctor/list")
Result deductionZsDoctorList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 澧為暱閮�-鍖荤敓绉佸煙缇ゆ暟鎹�-娓楅�忎笟缁�-瀵煎嚭
+ */
+ @PostMapping("/admin/group/report/zs/doctor/list/export")
+ Result deductionZsDoctorListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓鎵ц涓氱哗鏁版嵁-鍚湇鍔￠棬搴楁寚鏍�
+ */
+ @PostMapping("/admin/project/relation/report/doctor/target/list")
+ Result deductionDoctorTargetList(@RequestBody ShopReportDto shopReportDto);
}
--
Gitblit v1.8.0