From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java |  102 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 3ee2464..99c78f4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -1,8 +1,11 @@
 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.UserDetailReportDto;
+import com.hz.his.dto.report.UserReportDto;
 import com.hz.his.dto.report.UserReportListDto;
+import com.hz.his.dto.report.user.UserDetailSelectDto;
+import com.hz.his.dto.user.UserDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,10 +19,103 @@
 public interface BiUserService {
 
     /**
-     * 鎴愪氦鐜伴噾
+     * 鐢ㄦ埛鐜伴噾鎵ц鏁版嵁
      */
-    @PostMapping("/admin/user/report/cash/money")
+    @PostMapping("/admin/user/report/money/data/list")
     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);
+
+    /**
+     * 瀹㈡埛璧勬枡鍗�
+     */
+    @PostMapping("/admin/user/info/card/detail")
+    Result userInfoCardDetail(@RequestBody UserDto userDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-浼氬憳鏁伴噺
+     */
+    @PostMapping("/admin/rfmUser/report/total/list")
+    Result totalList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-RFM鍒嗗�间汉鏁�
+     */
+    @PostMapping("/admin/rfmUser/report/score/list")
+    Result scoreList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-瀹㈢兢鏁版嵁
+     */
+    @PostMapping("/admin/rfmUser/report/group/list")
+    Result groupList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-鎵ц椤圭洰鏁版嵁
+     */
+    @PostMapping("/admin/rfmUser/report/deduction/list")
+    Result deductionList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-棰滃�艰鍒掓爣绛句俊鎭�
+     */
+    @PostMapping("/admin/rfmUser/report/label/list")
+    Result labelList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃
+     */
+    @PostMapping("/admin/rfmUser/report/user/search/list")
+    Result userSearchList(@RequestBody UserDetailSelectDto userDetailSelectDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃-瀵煎嚭
+     */
+    @PostMapping("/admin/rfmUser/report/user/search/export")
+    Result userSearchExport(@RequestBody UserDetailSelectDto userDetailSelectDto);
+
 }

--
Gitblit v1.8.0