From 7418f94c91e8cafd479e3d675f1a127e8a4d479d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 17 四月 2023 18:09:39 +0800
Subject: [PATCH] 部分接口
---
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/BiClinicPerfService.java | 44 ++++
phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsVo.java | 97 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 4
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/AppointmentVisitVo.java | 21 ++
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/OperationalStatementsVo.java | 47 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java | 44 ++++
10 files changed, 535 insertions(+), 0 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/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 10da103..5f34e81 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -12,6 +12,10 @@
public class EmployeeReportDto {
/**鍛樺伐鏍囪瘑*/
private String employeeId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+ private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
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/PerformanceReqParamsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsVo.java
new file mode 100644
index 0000000..231fdd2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsVo.java
@@ -0,0 +1,97 @@
+package com.hz.his.dto.report;
+
+
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+
+
+/**
+ * 涓氱哗鎺ュ彛璇锋眰鍙傛暟vo
+ * @USER: fhx
+ * @DATE: 2022/12/14
+ **/
+@Data
+public class PerformanceReqParamsVo 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;
+
+
+ public PerformanceReqParamsVo() {
+ }
+}
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 鏄姹傛帴鍙ｅ墠缂�
+ */
+@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 鏄姹傛帴鍙ｅ墠缂�
+ */
+@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/BiConsultantPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
new file mode 100644
index 0000000..369d6a5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.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 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-consultant-perf")
+public interface BiConsultantPerfService {
+
+ /**
+ * 鍜ㄨ甯堟墽琛屼笟缁�
+ */
+ @PostMapping("/admin/clinic/perf/cash/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);
+
+
+
+
+}
--
Gitblit v1.8.0