From cc35e61d33b2421344bb22eb1ba50d093eacb562 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期二, 18 四月 2023 18:28:53 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 24 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java | 32 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiMemberService.java | 43 ++ phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java | 2 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java | 98 ++++ phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java | 52 ++ phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java | 25 + phis-feign/src/main/java/com/hz/his/dto/report/MemberVisitReqDto.java | 39 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTransferService.java | 23 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 141 +++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopCashService.java | 25 + phis-feign/src/main/java/com/hz/his/dto/report/AppointmentVisitVo.java | 21 + phis-feign/src/main/java/com/hz/his/dto/report/CxjReportReqDto.java | 23 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOrderReportService.java | 23 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java | 30 + phis-feign/src/main/java/com/hz/his/dto/report/BaseQueryVo.java | 121 ++++++ phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java | 35 + phis-feign/src/main/java/com/hz/his/dto/report/ReportReqVo.java | 21 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 2 phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java | 87 ++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java | 42 ++ phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java | 47 ++ phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java | 32 + phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java | 32 + phis-feign/src/main/java/com/hz/his/dto/report/UserMoneyReportReqDto.java | 19 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java | 44 ++ phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java | 43 ++ phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java | 37 + 28 files changed, 1,161 insertions(+), 2 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/AppointmentVisitVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/AppointmentVisitVo.java new file mode 100644 index 0000000..82934e7 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/AppointmentVisitVo.java @@ -0,0 +1,21 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +@Data +public class AppointmentVisitVo { + + private String shopName; + + private String shopId; + + private String startTime; + + private String endTime; + + //鏄惁鍙煡璇笂娴烽棬搴� 1鏄� 0鍚� + private Integer isShanghai; + + //鐘舵��-鍙栨秷 + public static final Integer STATUS_CANCEL = 2; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/BaseQueryVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/BaseQueryVo.java new file mode 100644 index 0000000..3b13600 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/BaseQueryVo.java @@ -0,0 +1,121 @@ +package com.hz.his.dto.report; + +/** + * 鍩虹鏌ヨ鍙傛暟鎷撳睍绫� + * @author wzh + */ +public class BaseQueryVo { + + /** 椤垫暟 */ + private Integer pageNum = 1; + + /** 鏉℃暟 */ + private Integer pageSize = 20; + + /** 鎼滅储鍐呭 */ + private String keyWord; + + /** 鏍囪瘑 */ + private String id; + + /** 鍚嶇О */ + private String name; + + /** 鐢ㄦ埛鏍囪瘑 */ + private String userId; + + /** RK 鍏ュ簱锛孋K鍑哄簱 */ + private String header; + + /** 鏄惁鎸夋湭濉啓椤哄簭鎺掑簭 */ + private Integer isOrderBy; + + /** 鏄惁蹇呮墦鏍囩椤哄簭鎺掑簭 */ + private Integer isMustTag; + + /** 鏍囩绫诲瀷缂栧彿 */ + private String tagTypeNo; + + public BaseQueryVo() { + } + + public Integer getPageNum() { + return pageNum == null || pageNum < 1 ? 1 : pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize == null || pageSize < 1 ? 20 : pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getKeyWord() { + return keyWord; + } + + public void setKeyWord(String keyWord) { + this.keyWord = keyWord; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getHeader() { + return header; + } + + public void setHeader(String header) { + this.header = header; + } + + public Integer getIsOrderBy() { + return isOrderBy; + } + + public void setIsOrderBy(Integer isOrderBy) { + this.isOrderBy = isOrderBy; + } + + public Integer getIsMustTag() { + return isMustTag; + } + + public void setIsMustTag(Integer isMustTag) { + this.isMustTag = isMustTag; + } + + public String getTagTypeNo() { + return tagTypeNo; + } + + public void setTagTypeNo(String tagTypeNo) { + this.tagTypeNo = tagTypeNo; + } +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java new file mode 100644 index 0000000..3e14371 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java @@ -0,0 +1,24 @@ +package com.hz.his.dto.report; + + +import lombok.Data; + +/** + * 璇婃墍鐜伴噾涓氱哗VO + * @USER: fhx + * @DATE: 2022/12/29 + **/ +@Data +public class ClinicPerfReqDto extends BaseQueryVo{ + + //闂ㄥ簵id + private String shopId; + //寮�濮嬫椂闂� + private String startTime; + //缁撴潫鏃堕棿 + private String endTime; + //鍏抽敭璇�(鐢ㄦ埛鍚�/CIQ) + private String keyWord; + //璁㈠崟鍙� + private String orderNo; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java new file mode 100644 index 0000000..d8ab8f4 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java @@ -0,0 +1,35 @@ +package com.hz.his.dto.report; + + +import com.hz.his.dto.PageDto; +import lombok.Data; + +import java.util.List; + +/** + * 鏍稿績椤圭洰鎶ヨ〃鎵╁睍 + * @author fwq + * */ +@Data +public class CoreProjectReportDto extends PageDto { + /**鏍稿績椤圭洰鍒嗙被缂栧彿*/ + private String typeNumberNo; + /**鏍稿績椤圭洰鍒嗙被鐖剁骇鏍囪瘑*/ + private String parentId; + /**鏍稿績椤圭洰鍒嗙被鏍囪瘑*/ + private String typeId; + /**鏍稿績椤圭洰绫诲瀷*/ + private Integer type; + /**闂ㄥ簵鍒楄〃*/ + private List<String> shopIdList; + /**寮�濮嬫椂闂�*/ + private String startTime; + /**缁撴潫鏃堕棿*/ + private String endTime; + /**鐧诲綍鍛樺伐鏍囪瘑*/ + private String loginEmpId; + /**鐧诲綍鍛樺伐鍚嶇О*/ + private String loginCnName; + /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/ + private String loginEmpStr; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CxjReportReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CxjReportReqDto.java new file mode 100644 index 0000000..c150a35 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/CxjReportReqDto.java @@ -0,0 +1,23 @@ +package com.hz.his.dto.report; + +import com.alibaba.fastjson.JSONArray; +import lombok.Data; + +/** + * CXJ鎶ヨ〃璇锋眰vo + * @USER: fhx + * @DATE: 2023/2/8 + **/ +@Data +public class CxjReportReqDto extends BaseQueryVo { + /** 寮�濮嬫椂闂� */ + private String startTime; + /** 缁撴潫鏃堕棿 */ + private String endTime; + /** 鍛樺伐id */ + private String employeeId; + /** 闂ㄥ簵id */ + private String shopId; + /** 澶氶棬搴梚d锛屾牸寮忥細[id, id] */ + private JSONArray shopIdArr; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/MemberVisitReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/MemberVisitReqDto.java new file mode 100644 index 0000000..898cdf4 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/MemberVisitReqDto.java @@ -0,0 +1,39 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +/** + * 浼氬憳鏉ヨ璇锋眰vo + * @USER: fhx + * @DATE: 2022/12/28 + **/ +@Data +public class MemberVisitReqDto extends BaseQueryVo{ + + //鍒拌寮�濮嬫椂闂� + private String startTime; + //鍒拌缁撴潫鏃堕棿 + private String endTime; + //闂ㄥ簵id + private String shopId; + //绉戝id +// private String departmentId; + //灏辫瘖绫诲瀷 + private String treatTypeName; + //鍒拌绫诲埆 + private String preTypeName; + //瀹㈡湇id + private String chatCorpUserId; + //鍖荤敓id + private String doctorId; + //鎵�灞炲挩璇㈠笀id + private String hisCorpUserId; + //鐢电綉鍜ㄨ甯坕d + private String internetCorpUserId; + //鎺ュ緟鍜ㄨ甯坕d + private String receptionConsultantId; + //娓犻亾 +// private String channel; + //鍒拌鍒涘缓浜篒d + private String createPersonnelId; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java new file mode 100644 index 0000000..3ad3d52 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java @@ -0,0 +1,47 @@ +package com.hz.his.dto.report; + +import com.hx.util.StringUtils; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class OperationalStatementsVo { + + /**骞翠唤:yyyy*/ + private String year; + /**鏈堜唤:yyyy-MM*/ + private String month; + /**鏈堜唤:yyyy-MM-dd*/ + private String day; + + /**闂ㄥ簵鏍囪瘑*/ + private String shopId; + private List<String> shopIdList; + /**寮�濮嬫椂闂�*/ + private Date startTime; + /**缁撴潫鏃堕棿*/ + private Date endTime; + /**鐧诲綍鍛樺伐鏍囪瘑*/ + private String loginEmpId; + /**鐧诲綍鍛樺伐鍚嶇О*/ + private String loginCnName; + /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/ + private String loginEmpStr; + + public List<String> getShopIdList() { + if(shopIdList == null){ + shopIdList = new ArrayList<>(); + } + if(StringUtils.noNull(shopId)&&!shopIdList.contains(shopId)){ + shopIdList.add(shopId); + } + return shopIdList; + } + + public void setShopIdList(List<String> shopIdList) { + this.shopIdList = shopIdList; + } +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java new file mode 100644 index 0000000..b4851de --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java @@ -0,0 +1,87 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +/** + * 涓氱哗鎺ュ彛璇锋眰鍙傛暟vo + * @USER: fhx + * @DATE: 2022/12/14 + **/ +@Data +public class PerformanceReqParamsDto extends BaseQueryVo { + + public static final int NO = 0; + public static final int YES = 1; + + private Integer tabType; + /**鐧诲綍鍛樺伐鏍囪瘑*/ + private String loginEmpId; + /**鐧诲綍鍛樺伐鍚嶇О*/ + private String loginCnName; + /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/ + private String loginEmpStr; + //寮�鍗曞紑濮嬫椂闂� + private String orderStartTime; + //寮�鍗曠粨鏉熸椂闂� + private String orderEndTime; + //鎵ц寮�濮嬫椂闂� + private String deductStartTime; + //鎵ц缁撴潫鏃堕棿 + private String deductEndTime; + + //鎵�灞為棬搴梚d + private String belongShopId; + //鏈嶅姟闂ㄥ簵id + private String serviceShopId; + //寮�鍗曢棬搴梚d + private String orderShopId; + //鏀堕摱闂ㄥ簵id + private String cashierShopId; + + //璁㈠崟绫诲瀷 + private String orderType; + //璁㈠崟鍙� + private String orderNo; + //娓犻亾鍒嗙被id + private String channelsTypeId; + //娓犻亾id + private String channelId; + //瀹㈡埛 + private String userName; + //瀹㈡埛绫诲埆 + private String userClass; + //椤圭洰绫诲埆 + private String basicType; + //椤圭洰鍐呭 + private String commonName; + //涓氬姟鍒嗙被 + private String businessTypeName; + //钀ラ攢鍒嗙被 + private String marketingType; + //鎵ц鍖荤敓id + private String deductionDoctorId; + //鎶ゅ+id + private String nurseCorpUserId; + //鎵�灞炲挩璇㈠笀id + private String belongConsultantId; + //鍖荤敓鎵ц涓氱哗-瑙掕壊 + private String doctorPrefRole; + //鍖荤敓鎵ц涓氱哗-浜哄憳 (鍖荤敓銆佸尰鍔┿�侀夯閱夊笀) + private String doctorPrefName; + + //鎶ゅ+鎵ц涓氱哗-瑙掕壊 + private String nursePrefRole; + //鎶ゅ+鎵ц涓氱哗-浜哄憳 + private String nursePrefName; + + //鍜ㄨ甯堟墽琛屼笟缁�-瑙掕壊 + private String consultantPrefRole; + //鍜ㄨ甯堟墽琛屼笟缁�-浜哄憳 + private String consultantPrefName; + + //姹囨�绘柟寮忓瓧娈�-------------- + //姹囨�绘槸鍚︽寜闂ㄥ簵 + private Integer sumIsShop = NO; + //姹囨�昏鑹� + private String sumRole; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ReportReqVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/ReportReqVo.java new file mode 100644 index 0000000..ba378a1 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/ReportReqVo.java @@ -0,0 +1,21 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +/** + * 鎶ヨ〃璇锋眰vo + * @USER: fhx + * @DATE: 2023/3/9 + **/ +@Data +public class ReportReqVo extends BaseQueryVo { + + //寮�濮嬫椂闂� + private String startTime; + //缁撴潫鏃堕棿 + private String endTime; + //鐢ㄦ埛鍚嶇О or CIQ + private String userName; + + +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java new file mode 100644 index 0000000..9bf67f6 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java @@ -0,0 +1,52 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +import java.util.List; + +/** + * @Author 闂ㄥ簵涓氱哗鎶ヨ〃瀹炰綋 + */ +@Data +public class ShopCashReportDto { + /**闂ㄥ簵鏍囪瘑*/ + private String shopId; + /** 涓氱哗绫诲瀷 */ + private String type; + /**寮�濮嬫椂闂�*/ + private String startTime; + /**缁撴潫鏃堕棿*/ + private String endTime; + /**闂ㄥ簵鍒楄〃鏍囪瘑*/ + private List<String> shopIdList; + + /**涓氱哗绫诲瀷-闂ㄥ簵鏃ョ幇閲戜笟缁�*/ + public static final String TYPE_DAY_CASH= "day_cash"; + /**涓氱哗绫诲瀷-闂ㄥ簵鏃ユ墽琛屼笟缁�*/ + public static final String TYPE_DAY_IMPLEMENT= "day_implement"; + /**涓氱哗绫诲瀷-闂ㄥ簵鍛ㄧ幇閲戜笟缁�*/ + public static final String TYPE_WEEK_CASH= "week_cash"; + /**涓氱哗绫诲瀷-闂ㄥ簵鍛ㄦ墽琛屼笟缁�*/ + public static final String TYPE_WEEK_IMPLEMENT= "week_implement"; + /**涓氱哗绫诲瀷-闂ㄥ簵鏈堢幇閲戜笟缁�*/ + public static final String TYPE_MONTH_CASH= "month_cash"; + /**涓氱哗绫诲瀷-闂ㄥ簵鏈堟墽琛屼笟缁�*/ + public static final String TYPE_MONTH_IMPLEMENT= "month_implement"; + + + /** 鑾峰彇鏌ヨ闂ㄥ簵insql */ + public String getSelectShopInSql(){ + if(shopIdList == null || shopIdList.size() < 1){ + return null; + } + + StringBuffer sql = new StringBuffer(); + sql.append("("); + for(String shopId : shopIdList){ + sql.append("'").append(shopId).append("',"); + } + sql.delete(sql.length()-1, sql.length()); + sql.append(")"); + return sql.toString(); + } +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java new file mode 100644 index 0000000..7cdcddd --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java @@ -0,0 +1,25 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +/** + * TMK璁㈠崟涓氱哗璇锋眰vo + * @USER: fhx + * @DATE: 2023/1/4 + **/ +@Data +public class TmkOrderPerfReqDto extends BaseQueryVo { + + //寮�濮嬫椂闂� + private String startTime; + //缁撴潫鏃堕棿 + private String endTime; + //闂ㄥ簵 + private String shopId; + //鐢电綉鍜ㄨ甯坕d + private String internetCorpUserId; + //瀹㈡湇id + private String chatCorpUserId; + //鍓嶇疆澶╂暟 + private Integer leadDays; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserMoneyReportReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserMoneyReportReqDto.java new file mode 100644 index 0000000..312fb4d --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserMoneyReportReqDto.java @@ -0,0 +1,19 @@ +package com.hz.his.dto.report; + +import lombok.Data; + +/** + * 鐢ㄦ埛閲戦鎶ヨ〃璇锋眰 + * @USER: fhx + * @DATE: 2023/3/7 + **/ +@Data +public class UserMoneyReportReqDto extends BaseQueryVo { + //寮�濮嬫椂闂� + private String startTime; + //缁撴潫鏃堕棿 + private String endTime; + //鐢ㄦ埛鍚嶇О or CIQ + private String userName; + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java new file mode 100644 index 0000000..a6948c1 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java @@ -0,0 +1,98 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.AppointmentVisitVo; +import com.hz.his.dto.report.ConsultantCashReportDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 棰勭害鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-app-report") +public interface BiAppReportService { + + /** + * 瀹汉鍒板簵鍑嗘椂鍒嗘瀽鎶ヨ〃 + */ + @PostMapping("/report/appointment/store/analysis") + Result storeAnalysis(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 闂ㄥ簵鍙栨秷姒傚喌 + */ + @PostMapping("/report/appointment/shop/cancel") + Result shopCancel(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 浼氬憳鍚勭瓑绾у彇娑堟鍐� + */ + @PostMapping("/report/appointment/userLevel/cancel") + Result userLevelCancel(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍜ㄨ甯堝彇娑堢巼 + */ + @PostMapping("/report/appointment/consultant/cancel") + Result consultantCancel(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 闂ㄥ簵杩熷埌15鍒嗛挓浠ヤ笂鎯呭喌 + */ + @PostMapping("/report/appointment/shop/timediff") + Result shopTimediff(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍚勭瓑绾ц繜鍒�15鍒嗛挓浠ヤ笂浜烘暟 + */ + @PostMapping("/report/appointment/userLevel/timediff") + Result userLevelTimediff(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍜ㄨ甯堣繜鍒扮巼 + */ + @PostMapping("/report/appointment/consultant/timediff") + Result consultantTimediff(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 闂ㄥ簵杩熷埌鏃堕棿鍒嗗竷 + */ + @PostMapping("/report/appointment/shop/late") + Result shopLate(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍜ㄨ甯堝綋鏃ユ柊澧為绾︽鍐� + */ + @PostMapping("/report/appointment/consultant/add") + Result consultantAdd(@RequestBody AppointmentVisitVo appointmentVisitVo); + + + /** + * 鍜ㄨ甯堜复鏃舵敼椤�&澧為」姒傚喌 + */ + @PostMapping("/report/appointment/update/project") + Result updateProject(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 闂ㄥ簵鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍛樺崌绾э級 + */ + @PostMapping("/report/appointment/level/upgrade") + Result levelUpgrade(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍛樺崌绾э級 + */ + @PostMapping("/report/appointment/up/level") + Result upLevel(@RequestBody AppointmentVisitVo appointmentVisitVo); + + /** + * 鍒濊瘖鍏紬鍙风粦瀹氭鍐� + */ + @PostMapping("/report/appointment/gzh/binding") + Result gzhBinding(@RequestBody AppointmentVisitVo appointmentVisitVo); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java new file mode 100644 index 0000000..6e84d47 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiClinicPerfService.java @@ -0,0 +1,44 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.ClinicPerfReqDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 璇婃墍涓氱哗 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-clinic-perf") +public interface BiClinicPerfService { + + /** + * 璇婃墍鐜伴噾涓氱哗 + */ + @PostMapping("/admin/consultant/perf/list") + Result cashList(@RequestBody ClinicPerfReqDto reqDto); + + /** + * 璇婃墍鐜伴噾涓氱哗-鏀粯绫诲瀷姹囨�� + */ + @PostMapping("/admin/clinic/perf/cashPayTypeSummary") + Result cashPayTypeSummary(@RequestBody ClinicPerfReqDto reqDto); + + /** + * 璇婃墍鎵ц涓氱哗 + */ + @PostMapping("/admin/clinic/perf/deduct/list") + Result deductList(@RequestBody ClinicPerfReqDto reqDto); + + /** + * 鏀堕摱璇︾粏鍒楄〃 + */ + @PostMapping("/admin/clinic/perf/cashierDetailList") + Result cashierDetailList(@RequestBody ClinicPerfReqDto reqDto); + + + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java index 624e212..cf291b0 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java @@ -9,7 +9,7 @@ /** - * 鍜ㄨ甯堟棩琛� + * 鍜ㄨ甯堟棩鎶� * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� */ @FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day") diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java new file mode 100644 index 0000000..8e14d7d --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java @@ -0,0 +1,32 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.PerformanceReqParamsDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 鍜ㄨ甯堟墽琛屼笟缁� + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-consultant-perf") +public interface BiConsultantPerfService { + + /** + * 鍜ㄨ甯堟墽琛屼笟缁� + */ + @PostMapping("/admin/consultant/perf/list") + Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + /** + * 鍜ㄨ甯堟墽琛屼笟缁╂眹鎬� + */ + @PostMapping("/admin/consultant/perf/summary/list") + Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java new file mode 100644 index 0000000..412f13c --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java @@ -0,0 +1,42 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.CoreProjectReportDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 鏍稿績椤圭洰鍛ㄦ姤 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-core-project") +public interface BiCoreProjectService { + + /** + * 鏍规嵁鏍稿績椤圭洰绫诲瀷鏌ヨ闂ㄥ簵瀹屾垚鎯呭喌 + */ + @PostMapping("/admin/export/core/project/shop/list") + Result shopList(@RequestBody CoreProjectReportDto coreProjectReportDto); + + /** + * 鏍规嵁鏍稿績椤圭洰绫诲瀷鏌ヨ鍜ㄨ甯堝畬鎴愭儏鍐� + */ + @PostMapping("/admin/export/core/project/employee/list") + Result employeeList(@RequestBody CoreProjectReportDto coreProjectReportDto); + + /** + * 鏍规嵁鏍稿績椤圭洰绫诲瀷鏌ヨ鍖荤敓瀹屾垚鎯呭喌 + */ + @PostMapping("/admin/export/core/project/doctor/list") + Result doctorList(@RequestBody CoreProjectReportDto coreProjectReportDto); + + /** + * 鎬绘瘮鐜� + */ + @PostMapping("/admin/export/core/project/data/rate") + Result dataAll(@RequestBody CoreProjectReportDto coreProjectReportDto); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java new file mode 100644 index 0000000..4b878c0 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java @@ -0,0 +1,43 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.CoreProjectReportDto; +import com.hz.his.dto.report.CxjReportReqDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * CXJ鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-cxj-project") +public interface BiCxjService { + + /** + * 棰勭害鎯呭喌 + */ + @PostMapping("/admin/cxj/report/appointmentSituation") + Result appointmentSituation(@RequestBody CxjReportReqDto cxjReportReqDto); + + /** + * 椤鹃棶瀹㈡埛棰勭害鍜屽埌搴楁椂闂存姌绾垮浘 + */ + @PostMapping("/admin/cxj/report/appTimeLineChart") + Result appTimeLineChart(@RequestBody CxjReportReqDto cxjReportReqDto); + + /** + * 绛夊緟鎯呭喌 + */ + @PostMapping("/admin/cxj/report/appTimeLineChart/waitSituation") + Result waitSituation(@RequestBody CxjReportReqDto cxjReportReqDto); + + /** + * 闈㈣瘖鎯呭喌 + */ + @PostMapping("/admin/cxj/report/consultSituation") + Result consultSituation(@RequestBody CxjReportReqDto cxjReportReqDto); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java new file mode 100644 index 0000000..90a2683 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java @@ -0,0 +1,32 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.PerformanceReqParamsDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 鍖荤敓鎵ц涓氱哗 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf") +public interface BiDoctorPerfService { + + /** + * 鍖荤敓鎵ц涓氱哗 + */ + @PostMapping("/admin/doctor/perf/list") + Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + /** + * 鍖荤敓鎵ц涓氱哗姹囨�� + */ + @PostMapping("/admin/doctor/perf/summary/list") + Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java new file mode 100644 index 0000000..84db793 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java @@ -0,0 +1,30 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.EmployeeReportDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 鍛樺伐-瀹㈡埛鍒嗘瀽 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-emp-user") +public interface BiEmpUserService { + + /** + * 鍖荤敓鎵ц涓氱哗 + */ + @PostMapping("/admin/employee/user/analyse/list") + Result list(@RequestBody EmployeeReportDto employeeReportDto); + + /** + * 鏌ョ湅瀹㈡埛鍒嗘瀽鏁版嵁V1鐗堟湰 + */ + @PostMapping("/admin/employee/user/analyse/list/V1") + Result analyseListOne(@RequestBody EmployeeReportDto employeeReportDto); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiMemberService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiMemberService.java new file mode 100644 index 0000000..0b7fc64 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiMemberService.java @@ -0,0 +1,43 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.MemberVisitReqDto; +import com.hz.his.dto.report.UserMoneyReportReqDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 浼氬憳鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-member-report") +public interface BiMemberService { + + /** + * 浼氬憳鏉ヨ-鏄庣粏鍒楄〃 + */ + @PostMapping("/admin/member/visit/detailsList") + Result detailsList(@RequestBody MemberVisitReqDto memberVisitReqDto); + + + /** + * 鍌ㄥ�奸噾浣欓鍙樺姩琛� + */ + @PostMapping("/admin/user/money/report/sfcList") + Result storedFundChangeList(@RequestBody UserMoneyReportReqDto userMoneyReportReqDto); + + /** + * 澧炲�奸噾浣欓鍙樺姩琛� + */ + @PostMapping("/admin/user/money/report/avcList") + Result addValueFundChangeList(@RequestBody UserMoneyReportReqDto userMoneyReportReqDto); + + /** + * 绉垎浣欓鍙樺姩琛� + */ + @PostMapping("/admin/user/money/report/icList") + Result integralChangeList(@RequestBody UserMoneyReportReqDto userMoneyReportReqDto); + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java new file mode 100644 index 0000000..c124cfc --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java @@ -0,0 +1,32 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.PerformanceReqParamsDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 鎶ゅ+鎵ц涓氱哗 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-nurse-perf") +public interface BiNursePerfService { + + /** + * 鎶ゅ+鎵ц涓氱哗 + */ + @PostMapping("/admin/nurse/perf/list") + Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + /** + * 鍖荤敓鎵ц涓氱哗姹囨�� + */ + @PostMapping("/admin/nurse/perf/summary/list") + Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto); + + + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java new file mode 100644 index 0000000..74c0c8b --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java @@ -0,0 +1,141 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.CoreProjectReportDto; +import com.hz.his.dto.report.OperationalStatementsVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 杩愯惀鍛ㄦ姤 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-ope-sta") +public interface BiOpeStaService { + + /** + * 棣栭〉澶撮儴鏁版嵁鍜岄棬搴楁墽琛屼笟缁╁畬鎴愭儏鍐碉紝鍙敮鎸佹湀浠芥搷浣� + */ + @PostMapping("/admin/operational/index") + Result index(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鐜伴噾涓氱哗&鎵ц涓氱哗鏃堕棿瓒嬪娍 + */ + @PostMapping("/admin/operational/cash/time-trend") + Result cashierSettlement(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍛樺伐鎵ц涓氱哗鎺掑悕-鍚勫挩璇㈠笀鎵ц涓氱哗 + */ + @PostMapping("/admin/operational/consultant/execute-achievement") + Result consultantExecute(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍛樺伐鎵ц涓氱哗鎺掑悕-鍖荤敓鎵ц涓氱哗鎺掑悕 + */ + @PostMapping("/admin/operational/doctor/execute-achievement") + Result doctorExecute(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鏈懆鍖荤敓姣忔棩闈㈣瘖浜烘暟鍙婃墽琛屼笟缁� + */ + @PostMapping("/admin/operational/doctor/week/execute-achievement") + Result doctorWeekExecute(@RequestBody OperationalStatementsVo operationalStatementsVo); + + + /** + * 鍚勯」鐩ぇ绫绘墽琛屾儏鍐靛垎鏋� + */ + @PostMapping("/admin/operational/project/category/execute") + Result projectCategory(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍒濊瘖鎴愪氦椤圭洰鎺掕 + */ + @PostMapping("/admin/operational/project/initial/diagnosis") + Result projectCategoryOne(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勯棬搴楅攢鍞儏鍐靛垎鏋愶紙鍒拌-鎴愪氦-寮�鍗曪級 + */ + @PostMapping("/admin/operational/shop/sale/order") + Result shopSale(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋� + */ + @PostMapping("/admin/operational/channels/first-day/deal") + Result channelDeal(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-娌夌潯瀹㈠敜閱掓垚浜ゅ垎鏋� + */ + @PostMapping("/admin/operational/channels/dead-sleep/deal") + Result deadSleep(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-娓犻亾鎬讳俊鎭� + */ + @PostMapping("/admin/operational/channels/deal") + Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo); + + + /** + * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-鏂板獟浣撴矇鐫″娓犻亾鐜伴噾涓氱哗 + */ + @PostMapping("/admin/operational/channels/new-media") + Result channelsNewMedia(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-闂ㄨ瘖鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋� + */ + @PostMapping("/admin/operational/shop/channels") + Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 闂ㄥ簵&鍜ㄨ甯堣�佸甫鏂伴澶╂垚浜ら噾棰濆垎鏋� + */ + @PostMapping("/admin/operational/shop/consultant/deal-analysis") + Result shopConsultant(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 闂ㄥ簵&鍜ㄨ甯圕RM鑹捐姱鑽熸垚浜� + */ + @PostMapping("/admin/operational/shop/consultant/crm-deal") + Result shopConsultantCrm(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍚勯棬搴�&鍜ㄨ甯堝垵璇�&澶嶈瘖鎯呭喌鍒嗘瀽(鏈噺閲戦) + */ + @PostMapping("/admin/operational/shop/consultant/all-deal") + Result shopConsultantDeal(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 娓犻亾鍒濊瘖鎴愪氦椤圭洰TOP3 + */ + @PostMapping("/admin/operational/channels/project/fisrt-deal") + Result channelsProjectFirstDeal(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍏捣閲婃斁浜烘暟 + */ + @PostMapping("/admin/operational/high-seas/release") + Result highSeasRelease(@RequestBody OperationalStatementsVo operationalStatementsVo); + + /** + * 鍖荤敓鏍稿績椤圭洰鎵ц鎯呭喌 + */ + @PostMapping("/admin/operational/doctor/core/project") + Result doctorCoreProject(@RequestBody CoreProjectReportDto coreProjectReportDto); + + /** + * RFM鏁版嵁鏌ョ湅 + */ + @PostMapping("/admin/operational/rfm/data/list") + Result rfmDataList(@RequestBody OperationalStatementsVo operationalStatementsVo); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOrderReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOrderReportService.java new file mode 100644 index 0000000..35a0e5f --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOrderReportService.java @@ -0,0 +1,23 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.ReportReqVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 闂ㄥ簵涓氱哗鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-order-report") +public interface BiOrderReportService { + + /** + * 闂ㄨ瘖闂磋浆璇婅浆鐤楁姤琛� + */ + @PostMapping("/admin/order/report/rorList") + Result referralOrderReportList(@RequestBody ReportReqVo reportReqVo); + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopCashService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopCashService.java new file mode 100644 index 0000000..f6f42ae --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopCashService.java @@ -0,0 +1,25 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.ShopCashReportDto; +import com.hz.his.dto.report.ShopReportDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 闂ㄥ簵涓氱哗鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-cash") +public interface BiShopCashService { + + /** + * 闂ㄥ簵涓氱哗鎶ヨ〃 + * ArriveShopVo + */ + @PostMapping("/report/shop/cash/list") + Result shopList(@RequestBody ShopCashReportDto shopCashReportDto); + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java new file mode 100644 index 0000000..4b2f735 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java @@ -0,0 +1,37 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.PerformanceReqParamsDto; +import com.hz.his.dto.report.TmkOrderPerfReqDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * TMK(鐢电綉鍜ㄨ甯�)涓氱哗 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-tmk-perf") +public interface BiTmkPerfService { + + /** + * 璁㈠崟涓氱哗鏄庣粏鍒楄〃 + */ + @PostMapping("/admin/tmk/perf/orderPerfList") + Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); + + /** + * 鐢电綉涓氱哗姹囨�� + */ + @PostMapping("/admin/tmk/perf/summary/list") + Result list(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); + + /** + * 鐢电綉涓氱哗姹囨��-鎬昏 + */ + @PostMapping("/admin/tmk/perf/summary/sumData") + Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTransferService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTransferService.java new file mode 100644 index 0000000..3a15bfd --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTransferService.java @@ -0,0 +1,23 @@ +package com.hz.his.feign.service.platform.bi; + +import com.hx.resultTool.Result; +import com.hz.his.dto.report.ReportReqVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * 闂ㄥ簵涓氱哗鎶ヨ〃 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-transfer-report") +public interface BiTransferService { + + /** + * 杞椤圭洰 + */ + @PostMapping("/admin/transfer/report/tpList") + Result transferProjectList(@RequestBody ReportReqVo reportReqVo); + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java index 2d77c81..d646d81 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java @@ -39,7 +39,7 @@ /** * 鎻愪氦璋冩煡闂嵎 */ - @PostMapping(value = "/questionnaire/submit") + @PostMapping(value = "/questionnaire/investigate/submit") Result submit(QuestionInvestigateDto questionInvestigateDto); } \ No newline at end of file -- Gitblit v1.8.0