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

fhx

2023-10-12 607dd05591843f0691a3e38fbb2c790a99c13f09

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

@@ -46,13 +46,48 @@
    @PostMapping("/admin/doctor/sale/report/project/type/list")
    Result projectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行项目-分类联合治疗
     */
    @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
    Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行项目-SPU占比
     * 治疗标签会员数量
     */
    @PostMapping("/admin/doctor/sale/report/project/spu/list")
    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
    @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
    Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 会员治疗情况总表
     */
    @PostMapping("/admin/doctor/sale/report/treat/detail/list")
    Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 重点品项数据
     */
    @PostMapping("/admin/doctor/sale/report/project/items/list")
    Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 分类治疗渗透情况
     */
    @PostMapping("/admin/doctor/sale/report/type/permeate/list")
    Result typePermeateList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行项目-联合多项情况
     */
    @PostMapping("/admin/doctor/sale/report/project/therapy/multiple")
    Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);





    /*******************************下面接口2.0废弃*********************************/
    /**
     * 执行部位
     */
@@ -64,6 +99,24 @@
     */
    @PostMapping("/admin/doctor/sale/report/loss/user/list")
    Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 重点品项流失预警-项目
     */
    @PostMapping("/admin/doctor/sale/report/loss/project/list")
    Result lossProjectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 重点品项流失预警-营销
     */
    @PostMapping("/admin/doctor/sale/report/loss/project/market/list")
    Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行项目-SPU占比
     */
    @PostMapping("/admin/doctor/sale/report/project/spu/list")
    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生治疗会员情况
@@ -88,7 +141,6 @@
     */
    @PostMapping("/admin/doctor/sale/report/user/list")
    Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);



}