From c0c3ba60f8620d2700c76afb62732ef940c38c70 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 06 五月 2023 14:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 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..8e14d7d 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,26 +17,14 @@
     /**
      * 鍜ㄨ甯堟墽琛屼笟缁�
      */
-    @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/clinic/perf/deduct/list")
-    Result deductList(@RequestBody ClinicPerfReqDto reqDto);
-
-    /**
-     * 鏀堕摱璇︾粏鍒楄〃
-     */
-    @PostMapping("/admin/clinic/perf/cashierDetailList")
-    Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto);
+    @PostMapping("/admin/consultant/perf/summary/list")
+    Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
 
 
 

--
Gitblit v1.8.0