From a15f626efe9271e241083bdd122cc38b25369747 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 21 六月 2023 16:27:40 +0800
Subject: [PATCH] Merge branch 'master-prod-new'

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java     |   11 +++++++++++
 phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java                |    4 ++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java      |   12 +++++++++++-
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java |   11 +++++++++++
 4 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
index c0cd102..8a9270a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
@@ -87,4 +87,8 @@
     private Integer sumIsShop = NO;
     //姹囨�昏鑹�
     private String sumRole;
+
+    //鎿嶄綔浜�
+    private String operatorId;
+    private String operatorName;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
index 8e14d7d..7e9d2f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
@@ -27,6 +27,17 @@
     Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
+    /**
+     * 鍜ㄨ甯堜笟缁╁鍑�
+     */
+    @PostMapping("/admin/consultant/perf/export")
+    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+    /**
+     * 鍜ㄨ甯堜笟缁╂眹鎬诲鍑�
+     */
+    @PostMapping("/admin/consultant/perf/summary/export")
+    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
index 90a2683..1968ec7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
@@ -27,6 +27,17 @@
     Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
+    /**
+     * 鍖荤敓涓氱哗瀵煎嚭
+     */
+    @PostMapping("/admin/doctor/perf/export")
+    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+    /**
+     * 鍖荤敓涓氱哗姹囨�诲鍑�
+     */
+    @PostMapping("/admin/doctor/perf/summary/export")
+    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
index c124cfc..2a5380c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
@@ -21,12 +21,22 @@
     Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
     /**
-     * 鍖荤敓鎵ц涓氱哗姹囨��
+     * 鎶ゅ+鎵ц涓氱哗姹囨��
      */
     @PostMapping("/admin/nurse/perf/summary/list")
     Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
+    /**
+     * 鎶ゅ+涓氱哗瀵煎嚭
+     */
+    @PostMapping("/admin/nurse/perf/export")
+    Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
+    /**
+     * 鎶ゅ+涓氱哗姹囨�诲鍑�
+     */
+    @PostMapping("/admin/nurse/perf/summary/export")
+    Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
 }

--
Gitblit v1.8.0