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/BiConsultantPerfService.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
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 369d6a5..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
@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
-import com.hz.his.dto.report.ClinicPerfReqDto;
+import com.hz.his.dto.report.PerformanceReqParamsDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,28 +17,27 @@
/**
* 鍜ㄨ甯堟墽琛屼笟缁�
*/
- @PostMapping("/admin/clinic/perf/cash/list")
- Result cashList(@RequestBody ClinicPerfReqDto reqDto);
+ @PostMapping("/admin/consultant/perf/list")
+ Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
/**
- * 璇婃墍鐜伴噾涓氱哗-鏀粯绫诲瀷姹囨��
+ * 鍜ㄨ甯堟墽琛屼笟缁╂眹鎬�
*/
- @PostMapping("/admin/clinic/perf/cashPayTypeSummary")
- Result cashPayTypeSummary(@RequestBody ClinicPerfReqDto reqDto);
+ @PostMapping("/admin/consultant/perf/summary/list")
+ Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
/**
- * 璇婃墍鎵ц涓氱哗
+ * 鍜ㄨ甯堜笟缁╁鍑�
*/
- @PostMapping("/admin/clinic/perf/deduct/list")
- Result deductList(@RequestBody ClinicPerfReqDto reqDto);
+ @PostMapping("/admin/consultant/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
/**
- * 鏀堕摱璇︾粏鍒楄〃
+ * 鍜ㄨ甯堜笟缁╂眹鎬诲鍑�
*/
- @PostMapping("/admin/clinic/perf/cashierDetailList")
- Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto);
-
-
+ @PostMapping("/admin/consultant/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
--
Gitblit v1.8.0