Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-28 cf2348cea6505b3a3777827bb64b6310de010f2e

 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);