From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 01 五月 2024 00:11:14 +0800 Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 102 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 90 insertions(+), 12 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java index cb348d7..3dbd0af 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java @@ -15,6 +15,12 @@ public interface BiDoctorSaleService { /** + * 鍖荤敓-涓氱哗鏁版嵁瀵煎嚭 + */ + @PostMapping("/admin/doctor/sale/report/total/data/export") + Result totalDataExport(@RequestBody EmployeeReportDto employeeReportDto); + + /** * 鍖荤敓-涓氱哗鎬诲垪琛� */ @PostMapping("/admin/doctor/sale/report/deduction/total/list") @@ -52,7 +58,91 @@ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list") Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto); + /** + * 娌荤枟鏍囩浼氬憳鏁伴噺 + */ + @PostMapping("/admin/doctor/sale/report/treat/label/info/list") + Result treatLabelInfoList(@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); + + /** + * 鍖荤敓鍒濆璇婄畝鎶� + */ + @PostMapping("/admin/doctor/sale/report/first/treat/list") + Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 浼氬憳娌荤枟鎯呭喌鎬昏〃 + */ + @PostMapping("/admin/doctor/sale/report/treat/detail/list/V2") + Result treatDetailListV2(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 閲嶇偣鍝侀」鏁版嵁 + */ + @PostMapping("/admin/doctor/sale/report/project/items/list/V2") + Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 閲嶇偣鍝侀」鏁版嵁-鎷嗗垎涓夊ぇ椤圭洰 + */ + @PostMapping("/admin/doctor/sale/report/project/items/list/V3") + Result projectItemListV3(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 瀹㈡埛棰勭害鍒拌鎯呭喌 + */ + @PostMapping("/admin/doctor/sale/report/appoint/list/V2") + Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 涓夊ぇ椤圭洰鎵ц涓氱哗 + */ + @PostMapping("/admin/doctor/sale/report/relation/project/list") + Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto); + + + /** + * 鏈嶅姟闂ㄥ簵鎵ц鎸囨爣涓氱哗 + */ + @PostMapping("/admin/doctor/sale/report/shop/target/list") + Result shopTargetList(@RequestBody EmployeeReportDto employeeReportDto); + + + + /*******************************涓嬮潰鎺ュ彛3.0搴熷純*********************************/ + /** + * 浼氬憳娌荤枟鎯呭喌鎬昏〃 + */ + @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/appoint/list") + Result appointList(@RequestBody EmployeeReportDto employeeReportDto); + + + + /*******************************涓嬮潰鎺ュ彛2.0搴熷純*********************************/ /** * 鎵ц閮ㄤ綅 */ @@ -76,18 +166,6 @@ */ @PostMapping("/admin/doctor/sale/report/loss/project/market/list") Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto); - - /** - * 娌荤枟鏍囩浼氬憳鏁伴噺 - */ - @PostMapping("/admin/doctor/sale/report/treat/label/info/list") - Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto); - - - - - - /** * 鎵ц椤圭洰-SPU鍗犳瘮 -- Gitblit v1.8.0