From 673dec22407bdf8fcea71ff9b3f467f22ad890a5 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 11 十二月 2023 16:39:18 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java | 2 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 34 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 13 +++++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java | 28 ++++++++++++++
4 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index 7be55d0..15760ea 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -5,7 +5,7 @@
import java.util.List;
/**
- * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * 鐢ㄦ埛鎶ヨ〃鎵╁睍
* @author fwq
* */
@Data
@@ -24,11 +24,20 @@
private List<String> roomList;
/**鍖荤敓鏍囪瘑*/
private List<String> doctorIdList;
+ /**娉ㄥ皠绉戝尰鐢熸爣璇�*/
+ private List<String> zskDoctorIdList;
+ /**鐨偆绉戝尰鐢熸爣璇�*/
+ private List<String> pfkDoctorIdList;
/**浼氬憳绛夌骇*/
private List<String> userLevelList;
/**浼氬憳鐘舵��*/
private List<String> userStatusList;
/**澧為暱涓績鏄犲皠椤圭洰*/
private List<String> upProjectIdList;
-
+ /**椤鹃棶鏍囪瘑*/
+ private List<String> adviserIdList;
+ /**鏍囩*/
+ private List<String> tagNameList;
+ /**鎵ц棰戞,1,2,3(-1涓哄娆�)*/
+ private Integer deductionNum;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
index 659b138..310fcb9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
@@ -16,4 +16,6 @@
private Integer isFilterTestAccount;
/**涓撳尯鏍囪瘑*/
private List<String> zoneList;
+ /**涓撳尯鐢ㄦ埛鏍囪瘑*/
+ private List<String> userIdList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java
new file mode 100644
index 0000000..4166d3b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiGroupService.java
@@ -0,0 +1,28 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.GroupUserReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 缇ゆ暟鎹�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-group-data")
+public interface BiGroupService {
+
+ /**
+ * 缇ゆ暟鎹�-澧為暱涓績椤圭洰娑堣垂棰戞鍜屾秷璐�
+ */
+ @PostMapping("/admin/group/report/deduction/total")
+ Result deductionTotal(@RequestBody GroupUserReportDto groupUserReportDto);
+
+
+
+
+
+
+}
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 803918e..6f18fed 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,7 +1,7 @@
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.UserReportDto;
import com.hz.his.dto.report.UserReportListDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,4 +22,36 @@
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/treat/tag/list")
+ Result treatTagList(@RequestBody UserReportDto userReportDto);
+
+ /**
+ * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩
+ */
+ @PostMapping("/admin/user/report/treat/mj/tag/list")
+ Result treatMjTagList(@RequestBody UserReportDto userReportDto);
+
+
+
}
--
Gitblit v1.8.0