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

fhx

2024-02-05 74527e7ce6ab1a5e09d3d4936e5157188e983e49

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java

@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.CxjReportReqDto;
import com.hz.his.dto.report.UserReportDto;
import com.hz.his.dto.report.UserReportListDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,4 +22,52 @@
    Result cashTotalList(@RequestBody UserReportListDto userReportListDto);


    /**
     * RFM会员池子
     */
    @PostMapping("/admin/user/report/rfm/data/list")
    Result rfmDataList(@RequestBody UserReportDto userReportDto);

    /**
     * 医生会员池子
     */
    @PostMapping("/admin/user/report/doctor/data/list")
    Result doctorDataList(@RequestBody UserReportDto userReportDto);

    /**
     * 项目消费频次和渗透率
     */
    @PostMapping("/admin/user/report/deduction/list")
    Result deductionList(@RequestBody UserReportDto userReportDto);

    /**
     * 项目消费频次和渗透率-导出渗透未执行
     */
    @PostMapping("/admin/user/report/deduction/list/export")
    Result deductionListExport(@RequestBody UserReportDto userReportDto);

    /**
     * 医生拉群线索-历史治疗标签
     */
    @PostMapping("/admin/user/report/treat/tag/list")
    Result treatTagList(@RequestBody UserReportDto userReportDto);

    /**
     * 医生拉群线索-历史治疗标签-导出
     */
    @PostMapping("/admin/user/report/treat/tag/list/export")
    Result treatTagListExport(@RequestBody UserReportDto userReportDto);

    /**
     * 医生拉群线索-美际标签
     */
    @PostMapping("/admin/user/report/treat/mj/tag/list")
    Result treatMjTagList(@RequestBody UserReportDto userReportDto);

    /**
     * 医生拉群线索-美际标签-导出
     */
    @PostMapping("/admin/user/report/treat/mj/tag/list/export")
    Result treatMjTagListExport(@RequestBody UserReportDto userReportDto);

}