Merge branch 'master-prod-new' into master-test

fwq

2024-04-12 2a3cbabe6a25030d5760cc31d5276042f691d62a

 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,6 +58,11 @@
    @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);

    /**
     * 医生执行业绩数据-含服务门店指标