From d5f27d8192422574047b7c557538c595088284a6 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 09 十一月 2023 17:45:01 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分 --- phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 111 insertions(+), 4 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 b49122c..7b91cfa 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 @@ -11,7 +11,7 @@ * 鍖荤敓蹇姤 * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� */ -@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf") +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf-sale") public interface BiDoctorSaleService { /** @@ -20,18 +20,25 @@ @PostMapping("/admin/doctor/sale/report/deduction/total/list") Result deductionList(@RequestBody EmployeeReportDto employeeReportDto); + /** * 鍖荤敓-鎵ц涓氱哗鏁版嵁-鍒嗛棬搴� */ @PostMapping("/admin/doctor/sale/report/deduction/shop/list") Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto); - /** - * 鍖荤敓-鏍稿績椤圭洰 + * 鍖荤敓-鏍稿績椤圭洰鍗犳瘮鏁版嵁 */ @PostMapping("/admin/doctor/sale/report/core/project/list") Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 鍖荤敓-鏍稿績椤圭洰涓氱哗杩借釜 + */ + @PostMapping("/admin/doctor/sale/report/core/project/list/shop") + Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto); + /** * 鎵ц椤圭洰-鍒嗙被 @@ -40,10 +47,111 @@ Result projectList(@RequestBody EmployeeReportDto employeeReportDto); /** + * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟 + */ + @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/appoint/list/V2") + Result appointListV2(@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搴熷純*********************************/ + /** * 鎵ц閮ㄤ綅 */ @PostMapping("/admin/doctor/sale/report/project/body/list") Result bodyList(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 娴佸け鏁版嵁 + */ + @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); + + /** + * 鍖荤敓娌荤枟浼氬憳鎯呭喌 + */ + @PostMapping("/admin/doctor/sale/report/treat/user/list") + Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto); /** * 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁 @@ -62,7 +170,6 @@ */ @PostMapping("/admin/doctor/sale/report/user/list") Result inviteList(@RequestBody EmployeeReportDto employeeReportDto); - } -- Gitblit v1.8.0