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

ANDRU-PC\Andru

2023-10-08 c8364d4a88edc727252b4087979713bf282e1dcf

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

 phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java

@@ -15,9 +15,11 @@
public interface DFileDownloadService {

    /**导出类型-底表-预约数据*/

    @PostMapping(value = "/report/export/app/list")
    Result exportAppointmentList(@RequestBody DAppointDto dAppointDto);
    /**导出类型-底表-医生排班*/

    @PostMapping(value = "/report/export/doctor/time/monthData")
    Result exportDoctorTime(@RequestBody DDoctorTimeDto dDoctorTimeDto);
    /**导出类型-底表-优惠券*/
    @PostMapping(value = "/report/export/coupon/list")
    Result exportCoupon(@RequestBody DCouponDto dCouponDto);

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

@@ -167,4 +167,10 @@
    @PostMapping("/admin/operational/channels/deal/dw/spa")
    Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * SPA代王业绩报表-导出
     */
    @PostMapping("/admin/operational/channels/deal/dw/spa/export")
    Result channelsSpaDwExport(@RequestBody OperationalStatementsVo operationalStatementsVo);

}