From 5bbbe45edd2b1bbb88ef0bd380ec009de86ff2dc Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 27 九月 2023 17:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java | 17
phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java | 135 +++++
phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java | 18
phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java | 17
phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java | 21
phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java | 46
phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java | 21
phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 5
phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java | 40 +
phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java | 32 +
phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java | 104 ++++
phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java | 32 +
phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java | 51 ++
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java | 50 ++
phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java | 22
phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java | 16
phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java | 13
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java | 2
/dev/null | 46 -
phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java | 40 +
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java | 17
phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java | 578 +++++++++++++++++++++++
38 files changed, 1,425 insertions(+), 69 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java
new file mode 100644
index 0000000..cd13f99
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 娲诲姩
+ **/
+@Data
+public class DActivityDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
index 4b93b88..e7b6a14 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -1,6 +1,6 @@
package com.hz.his.dto;
-import com.hz.his.dto.common.OperateDto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
@@ -8,27 +8,27 @@
* 瀵煎嚭棰勭害Dto
*/
@Data
-public class DAppointDto extends OperateDto {
+public class DAppointDto extends DCommonDto {
- String startTime;
- String endTime;
- String shopId;
- String doctorId;
- String keyWord;
- String corpUserName;
- String doctorName;
- String type;
- Integer orderType;
- Integer isMicApprove;
- String projectName;
- String userLevel;
- String field;
- String id;
- String userId;
- String roleId;
- String corpUserId;
- String createCuName;
- String channelType;
- String chatCorpName;
- String appType;
+ private String startTime;
+ private String endTime;
+ private String shopId;
+ private String doctorId;
+ private String keyWord;
+ private String corpUserName;
+ private String doctorName;
+ private String type;
+ private Integer orderType;
+ private Integer isMicApprove;
+ private String projectName;
+ private String userLevel;
+ private String field;
+ private String id;
+ private String userId;
+ private String roleId;
+ private String corpUserId;
+ private String createCuName;
+ private String channelType;
+ private String chatCorpName;
+ private String appType;
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java
new file mode 100644
index 0000000..4499aac
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍗￠」
+ **/
+@Data
+public class DCardDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java
new file mode 100644
index 0000000..49273d6
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鎶曡瘔璁板綍
+ **/
+@Data
+public class DComplaintDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
new file mode 100644
index 0000000..a8059fd
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
@@ -0,0 +1,104 @@
+package com.hz.his.dto;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍜ㄨ璁板綍
+ **/
+@Data
+public class DConsultationDto{
+ // 璁板綍id 缁ф壙dto宸插瓨鍦�
+ private String id;
+ // 鐢ㄦ埛ID
+ private String userId;
+ // 闂ㄥ簵/璇婃墍ID
+ private String shopId;
+ // 绉戝缂栫爜
+ private String departmentCode;
+ // 绉戝鍚嶇О
+ private String departmentName;
+
+ /**鍜ㄨ绫诲瀷*/
+ private Integer consultType;
+ // 鍜ㄨ鏂瑰紡浠ｇ爜 瀛楀吀琛�
+ private String methodCode;
+ // 鍜ㄨ鏂瑰紡鍚嶇О
+ private String methodCodeName;
+
+ // 鍜ㄨ椤圭洰 - ID鍒楄〃
+ private String neededProjectIds;
+ // 鎺ㄨ崘椤圭洰 - ID鍒楄〃
+ private String recommendedProjectIds;
+ // 鍏虫敞娲诲姩 - ID鍒楄〃
+ private String focusActivitiesIds;
+ // 娼滃湪椤圭洰 - ID鍒楄〃
+ private String potentialProjectIds;
+
+ // 鏈垚浜ゅ師鍥�
+ private String description;
+ // 鍜ㄨ鍐呭
+ private String content;
+ // 澶囨敞
+ private String remark;
+ // 鏄惁鎰挎剰涓婇棬
+ private Integer isCanCome = 0;
+ // 鏄惁鍒拌
+ private Integer isVisit = 0;
+ // 鏄惁浠樻
+ private Integer isPay = 0;
+ // 鏄惁鑽夌
+ private Integer isDraft = 0;
+
+ // 椤电爜
+ private Integer pageNum;
+ // 椤垫暟
+ private Integer pageSize;
+ // 寮�濮嬫椂闂�
+ private Date startTime;
+ // 缁撴潫鏃堕棿
+ private Date endTime;
+ // 鐢ㄦ埛鍚嶇О
+ private String userName;
+ // 鍏抽敭璇嶆煡璇� 鏈垚浜ゅ師鍥� 鍜ㄨ鍐呭 澶囨敞
+ private String keyWord;
+ // 鍛樺伐瑙掕壊
+ private String roleId;
+
+ // 鍜ㄨ甯�
+ private String hisCorpUserId;
+ // 鐢电綉鍜ㄨ甯�
+ private String internetCorpUserId;
+ // 瀹㈡湇
+ private String chatCorpUserId;
+ // 鍒涘缓浜�
+ private String createEmployeeId;
+ // 鍒涘缓浜洪儴闂�
+ private String createEmployeePartId;
+ // 鍏虫敞娲诲姩
+ private String focusActivityId;
+ // 鍜ㄨ椤圭洰
+ private String neededProjectTypeId;
+ // 娼滃湪椤圭洰
+ private String potentialProjectTypeId;
+ // 鎺ㄨ崘椤圭洰
+ private String recommendedProjectId;
+ // 瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+ private String channelsTypeId;
+ // 瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+ private String channelId;
+ // 瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+ private String channel2Id;
+ // 鍒拌绫诲瀷
+ private String recentVisitType;
+ // 鍒拌鐘舵��
+ private Integer recentVisitStatus;
+ // 鏄惁鎴愪氦
+ private Integer isMakeADeal;
+ // 瀹㈡埛鎴愪氦鏍囩
+ private String isMakeADealLabel;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
new file mode 100644
index 0000000..26cf3d1
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧-鑽搧
+ **/
+@Data
+public class DConsumablesDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java
new file mode 100644
index 0000000..12a02e2
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼樻儬鍒哥爜
+ **/
+@Data
+public class DCouponDto extends DCommonDto {
+ private String couponId;
+ private Date startCollectionTime;
+ private Date endCollectionTime;
+ private Integer isUse;
+ private String couponCostDepartment;
+ private Integer isReceive;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
new file mode 100644
index 0000000..e2ea779
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎵ц璁板綍
+ **/
+@Data
+public class DDeductionDto extends DCommonDto {
+ private Integer status;
+ private String shopId;
+ private String departmentCode;
+ private String projectName;
+ private String hisProjectName;
+ private Integer drugsType;
+ private String userId;
+ private String roleId;
+ private String recordNo;
+ private String treatSingleNo;
+ private String belongDoctor;
+ private String belongNurse;
+ private String belongAdviser;
+ private String userShopId;
+ private String deShopId;
+ private Date startRescindedTime;
+ private Date endRescindedTime;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
new file mode 100644
index 0000000..c562660
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 璁惧
+ **/
+@Data
+public class DDeviceDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java
new file mode 100644
index 0000000..be59c9a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍖荤敓鎺掔彮
+ * @USER: fhx
+ * @DATE: 2023/9/19
+ **/
+@Data
+public class DDoctorTimeDto extends DCommonDto {
+
+ private String shopId;
+ private String monthStr;
+ private String doctorId;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
new file mode 100644
index 0000000..4270eba
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 瀵煎嚭鍛樺伐Dto
+ */
+@Data
+public class DEmployeeDto extends DCommonDto {
+ private Integer isJob;
+ private Integer isPerformanceEmp;
+ private String roleUniqueStr;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
new file mode 100644
index 0000000..3759f6d
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒濊瘖鍗�
+ **/
+@Data
+public class DFirstTreatCardDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java
new file mode 100644
index 0000000..40749ec
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢靛瓙鐥呭巻
+ **/
+@Data
+public class DMedicalRecordDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
new file mode 100644
index 0000000..ee67f2a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閲戦鍙樺姩
+ **/
+@Data
+public class DMoneyLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
new file mode 100644
index 0000000..085b711
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
@@ -0,0 +1,50 @@
+package com.hz.his.dto;
+
+
+import lombok.Data;
+
+/**
+ * 璁㈠崟
+ **/
+@Data
+public class DOrderDto {
+
+ private String startTime;
+ private String endTime;
+ private Integer status;
+ private String orderNo;
+ private String type;
+ private Integer owe;
+ private String projectName;
+ private String operationName;
+ private String developerName;
+ private String employeeName;
+ private String phisOrderNo;
+ private String prescriptionNo;
+ private String appIdCode;
+ private String sourceName;
+ private String sourceOrderNo;
+ private Integer applyStatus;
+ private Integer payStatus;
+ private Integer refundStatus;
+ private Integer isCustomerConfirm;
+ private Integer isOldBringNew;
+ private Integer isBothTheOne;
+ private String channelName;
+ private String inviteeName;
+ private String userInviteeName;
+ private String userChannelName;
+ private String shopName;
+ private String departmentName;
+ private String doctorName;
+ private String hisCorpUserName;
+ private String userName;
+ private String userId;
+ private String shopIds;
+ private String roleUniqueStr;
+ private String userStatus;
+ private String userLevel;
+ private String internetCorpUserId;
+ private String internetCorpUserName;
+ private String keyWord;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
new file mode 100644
index 0000000..26aa136
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鏀舵鏄庣粏
+ **/
+@Data
+public class DPayDetailDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java
new file mode 100644
index 0000000..f3cd89f
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢靛瓙澶勬柟
+ **/
+@Data
+public class DPrescriptionDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
new file mode 100644
index 0000000..a9ab21b
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 椤圭洰SKU
+ **/
+@Data
+public class DProjectSkuDto extends DCommonDto {
+
+ private String name;
+ private Integer enable;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java
new file mode 100644
index 0000000..ee9699f
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 淇冮攢
+ **/
+@Data
+public class DPromotionDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
new file mode 100644
index 0000000..02f894e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閫�娆惧崟
+ **/
+@Data
+public class DRefundDto extends DCommonDto {
+
+ private String shopId;
+ private String sourceType;
+ private Integer status;
+ private String roleId;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
new file mode 100644
index 0000000..8acb3ab
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒拌璁板綍
+ **/
+@Data
+public class DReturnVisitDto extends DCommonDto {
+
+ private String userId;
+ private Date planStartTime;
+ private Date planEndTime;
+ private Date returnVisitStartTime;
+ private Date returnVisitEndTime;
+ private Date doneStartTime;
+ private Date doneEndTime;
+ private String returnVisitType;
+ private String returnVisitPlan;
+ private String returnVisitMethod;
+ private Integer returnVisitStatus;
+ private Integer doneStatus;
+ private Integer timeoutStatus;
+ private Integer visitResultStatus;
+ private Integer satisfiedStatus;
+ private String shopId;
+ private String roleId;
+ private String createPersonName;
+ private String channelType;
+ private String createPersonId;
+ private String visitPersonId;
+ private String corpId;
+ private String corpName;
+ private String shopIds;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
new file mode 100644
index 0000000..f733adc
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閫氳瘽璁板綍鍙樺姩
+ **/
+@Data
+public class DTelLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
new file mode 100644
index 0000000..2460d9a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 娌荤枟鍗�
+ **/
+@Data
+public class DTreatSingleDto extends DCommonDto {
+
+ //鐢ㄦ埛id
+ private String userId;
+ //绫诲瀷
+ private Integer type;
+ //娌荤枟鍗曞彿
+ private String treatSingleNo;
+ //鎿嶄綔浜�
+ private String operatorName;
+ //鎶ゅ＋鍚嶇О
+ private String nurseName;
+ //鍖荤敓鍚嶇О
+ private String doctorName;
+ //鏄惁鍒掓墸
+ private Integer isDeduct;
+ //鍒涘缓鏃堕棿
+ private String createTime;
+ //闂ㄥ簵id
+ private String shopId;
+ //鏄惁鍒嗛厤娌荤枟
+ private Integer isPerTreat;
+ //鍒拌璁㈠崟id
+ private String visitOrderId;
+ //闂ㄥ簵id
+ private List<String> shopIdList;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java
new file mode 100644
index 0000000..7d8a1ca
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 杞禒
+ **/
+@Data
+public class DTurnDto extends DCommonDto {
+
+ // 杞浜洪棬搴梚d
+ private String shopId;
+ // 杞浜篿d
+ private String turnId;
+ // 杞浜�
+ private String giveAway;
+ // 鍙楄禒浜篿d
+ private String doneeId;
+ // 鍙楄禒浜�
+ private String donated;
+ // 瑙掕壊id
+ private String roleId;
+ // 绫诲瀷
+ private String type;
+ //鍙楄禒浜洪棬搴桰D
+ private String doneeShopId;
+ //璁㈠崟鍙�
+ private String orderNo;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
new file mode 100644
index 0000000..f2c2090
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒拌璁㈠崟(瀵煎尰)
+ **/
+@Data
+public class DVisitOrderDto extends DCommonDto {
+
+ private String doctorName;
+ private String userName;
+ private String adviserName;
+ private String nurseName;
+ private String shopId;
+ private String status;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
new file mode 100644
index 0000000..6b7d18e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒拌璁板綍
+ **/
+@Data
+public class DVisitRecordDto extends DCommonDto {
+
+ private String shopId;
+ private String preTypeName;
+ private String doctorName;
+ private String nurseName;
+ private String adviserName;
+ private Integer status;
+ private String inShopSql;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
new file mode 100644
index 0000000..a136d67
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
@@ -0,0 +1,51 @@
+package com.hz.his.dto.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ */
+@Data
+public class DCommonDto {
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operateMan;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜鸿鑹叉爣璇�(EmployeeRole)*/
+ private String opRoleId;
+ /**鎿嶄綔浜鸿鑹插瓧绗︿覆*/
+ private String opRoleStr;
+ /**鎿嶄綔浜鸿鑹插悕绉�*/
+ private String opRoleName;
+ /**澶囨敞*/
+ private String opRemark;
+
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+ /**鎼滅储鍏抽敭瀛�*/
+ private String searchData;
+ /**鎼滅储鍏抽敭瀛�*/
+ private String keyWord;
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
+ private String userKeyWord;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private List<String> userIdList;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
deleted file mode 100644
index dbcf98a..0000000
--- a/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hz.his.dto.common;
-
-import lombok.Data;
-
-/**
- * @author fwq
- */
-@Data
-public class OperateDto {
- /**鎿嶄綔浜烘爣璇�*/
- String operateId;
- /**鎿嶄綔浜哄悕绉�*/
- String operateMan;
-
-}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
deleted file mode 100644
index 92513a9..0000000
--- a/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.hz.his.dto.common;
-
-import java.util.Date;
-
-/**
- * @author fwq
- * 鏃堕棿鎵╁睍绫�
- */
-public class TimeDto {
-
- private String timeString;
-
- private Date timeDate;
-
- public TimeDto(String timeString) {
- this.timeString = timeString;
- }
-
- public TimeDto(Date timeDate) {
- this.timeDate = timeDate;
- }
-
- public TimeDto() {
- }
-
- public TimeDto(String timeString, Date timeDate) {
- this.timeString = timeString;
- this.timeDate = timeDate;
- }
-
- public String getTimeString() {
- return timeString;
- }
-
- public void setTimeString(String timeString) {
- this.timeString = timeString;
- }
-
- public Date getTimeDate() {
- return timeDate;
- }
-
- public void setTimeDate(Date timeDate) {
- this.timeDate = timeDate;
- }
-}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java
new file mode 100644
index 0000000..af7e94e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.user;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛璁板綍鍙樺姩
+ **/
+@Data
+public class DUserChangeLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
new file mode 100644
index 0000000..d07f973
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
@@ -0,0 +1,578 @@
+package com.hz.his.dto.user;
+
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛
+ **/
+public class DUserDto {
+ private List<DUserTagDto> userTagInfo;
+
+ private Integer appType;
+
+ private String userStatus;
+ private String hisCorpUserId;
+ private String hisCorpUserName;
+ private String shopId;
+ private String shopName;
+
+ private String cIq;
+
+ private String cStartTime;
+ private String cEndTime;
+
+ private String userLevel;
+
+ private String startBirthDay;
+ private String endBirthDay;
+
+ private String creator;
+
+ private String userType;
+
+
+
+ private Integer gender;
+
+ private Integer startAge;
+ private Integer endAge;
+
+ private String channelType;
+ private String channelId;
+
+ private String cuName;
+
+ private String userRole;
+
+ private String startReturnVisitTime;
+ private String endReturnVisitTime;
+
+ private String startFirstTime;
+ private String endFirstTime;
+
+ private String startlatelyTime;
+ private String endlatelyTime;
+
+ private String startFirstPayTime;
+ private String endFirstPayTime;
+
+ private String startLastPayTime;
+ private String endLastPayTime;
+
+ private Integer isComeShop;
+
+ private Integer isConsume;
+
+ private Integer isBindCRMTime;
+
+ private Integer isBindSTTime;
+
+ private Integer isBindGZHTime;
+
+ private String country;
+ private String province;
+ private String city;
+ private String area;
+
+ private String inviteeId;
+ private String inviteeName;
+
+ private String tmkName;
+ private String doctorNme;
+
+ private String noBugProject;
+ private String bugProject;
+ private String executeProjectType;
+ private String bugProjectType;
+
+ private String consultationProject;
+ private String consultationProjectType;
+
+ private String notUseProject;
+
+ private String userCardName;
+
+ private Integer expectedLossDay;
+
+ private String keyWord;
+
+ private Integer isPretriageCard;
+
+ private String indication1;
+ private String indication2;
+ private Integer indicationLevel;
+
+
+ public List<DUserTagDto> getUserTagInfo() {
+ return userTagInfo;
+ }
+
+ public void setUserTagInfo(List<DUserTagDto> userTagInfo) {
+ this.userTagInfo = userTagInfo;
+ }
+
+ public Integer getAppType() {
+ return appType;
+ }
+
+ public void setAppType(Integer appType) {
+ this.appType = appType;
+ }
+
+ public String getUserStatus() {
+ return userStatus;
+ }
+
+ public void setUserStatus(String userStatus) {
+ this.userStatus = userStatus;
+ }
+
+ public String getHisCorpUserId() {
+ return hisCorpUserId;
+ }
+
+ public void setHisCorpUserId(String hisCorpUserId) {
+ this.hisCorpUserId = hisCorpUserId;
+ }
+
+ public String getHisCorpUserName() {
+ return hisCorpUserName;
+ }
+
+ public void setHisCorpUserName(String hisCorpUserName) {
+ this.hisCorpUserName = hisCorpUserName;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getcIq() {
+ return cIq;
+ }
+
+ public void setcIq(String cIq) {
+ this.cIq = cIq;
+ }
+
+ public String getcStartTime() {
+ return cStartTime;
+ }
+
+ public void setcStartTime(String cStartTime) {
+ this.cStartTime = cStartTime;
+ }
+
+ public String getcEndTime() {
+ return cEndTime;
+ }
+
+ public void setcEndTime(String cEndTime) {
+ this.cEndTime = cEndTime;
+ }
+
+ public String getUserLevel() {
+ return userLevel;
+ }
+
+ public void setUserLevel(String userLevel) {
+ this.userLevel = userLevel;
+ }
+
+ public String getStartBirthDay() {
+ return startBirthDay;
+ }
+
+ public void setStartBirthDay(String startBirthDay) {
+ this.startBirthDay = startBirthDay;
+ }
+
+ public String getEndBirthDay() {
+ return endBirthDay;
+ }
+
+ public void setEndBirthDay(String endBirthDay) {
+ this.endBirthDay = endBirthDay;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+
+ public Integer getGender() {
+ return gender;
+ }
+
+ public void setGender(Integer gender) {
+ this.gender = gender;
+ }
+
+ public Integer getStartAge() {
+ return startAge;
+ }
+
+ public void setStartAge(Integer startAge) {
+ this.startAge = startAge;
+ }
+
+ public Integer getEndAge() {
+ return endAge;
+ }
+
+ public void setEndAge(Integer endAge) {
+ this.endAge = endAge;
+ }
+
+ public String getChannelType() {
+ return channelType;
+ }
+
+ public void setChannelType(String channelType) {
+ this.channelType = channelType;
+ }
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getCuName() {
+ return cuName;
+ }
+
+ public void setCuName(String cuName) {
+ this.cuName = cuName;
+ }
+
+ public String getUserRole() {
+ return userRole;
+ }
+
+ public void setUserRole(String userRole) {
+ this.userRole = userRole;
+ }
+
+ public String getStartReturnVisitTime() {
+ return startReturnVisitTime;
+ }
+
+ public void setStartReturnVisitTime(String startReturnVisitTime) {
+ this.startReturnVisitTime = startReturnVisitTime;
+ }
+
+ public String getEndReturnVisitTime() {
+ return endReturnVisitTime;
+ }
+
+ public void setEndReturnVisitTime(String endReturnVisitTime) {
+ this.endReturnVisitTime = endReturnVisitTime;
+ }
+
+ public String getStartFirstTime() {
+ return startFirstTime;
+ }
+
+ public void setStartFirstTime(String startFirstTime) {
+ this.startFirstTime = startFirstTime;
+ }
+
+ public String getEndFirstTime() {
+ return endFirstTime;
+ }
+
+ public void setEndFirstTime(String endFirstTime) {
+ this.endFirstTime = endFirstTime;
+ }
+
+ public String getStartlatelyTime() {
+ return startlatelyTime;
+ }
+
+ public void setStartlatelyTime(String startlatelyTime) {
+ this.startlatelyTime = startlatelyTime;
+ }
+
+ public String getEndlatelyTime() {
+ return endlatelyTime;
+ }
+
+ public void setEndlatelyTime(String endlatelyTime) {
+ this.endlatelyTime = endlatelyTime;
+ }
+
+ public String getStartFirstPayTime() {
+ return startFirstPayTime;
+ }
+
+ public void setStartFirstPayTime(String startFirstPayTime) {
+ this.startFirstPayTime = startFirstPayTime;
+ }
+
+ public String getEndFirstPayTime() {
+ return endFirstPayTime;
+ }
+
+ public void setEndFirstPayTime(String endFirstPayTime) {
+ this.endFirstPayTime = endFirstPayTime;
+ }
+
+ public String getStartLastPayTime() {
+ return startLastPayTime;
+ }
+
+ public void setStartLastPayTime(String startLastPayTime) {
+ this.startLastPayTime = startLastPayTime;
+ }
+
+ public String getEndLastPayTime() {
+ return endLastPayTime;
+ }
+
+ public void setEndLastPayTime(String endLastPayTime) {
+ this.endLastPayTime = endLastPayTime;
+ }
+
+ public Integer getIsComeShop() {
+ return isComeShop;
+ }
+
+ public void setIsComeShop(Integer isComeShop) {
+ this.isComeShop = isComeShop;
+ }
+
+ public Integer getIsConsume() {
+ return isConsume;
+ }
+
+ public void setIsConsume(Integer isConsume) {
+ this.isConsume = isConsume;
+ }
+
+ public Integer getIsBindCRMTime() {
+ return isBindCRMTime;
+ }
+
+ public void setIsBindCRMTime(Integer isBindCRMTime) {
+ this.isBindCRMTime = isBindCRMTime;
+ }
+
+ public Integer getIsBindSTTime() {
+ return isBindSTTime;
+ }
+
+ public void setIsBindSTTime(Integer isBindSTTime) {
+ this.isBindSTTime = isBindSTTime;
+ }
+
+ public Integer getIsBindGZHTime() {
+ return isBindGZHTime;
+ }
+
+ public void setIsBindGZHTime(Integer isBindGZHTime) {
+ this.isBindGZHTime = isBindGZHTime;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public String getInviteeId() {
+ return inviteeId;
+ }
+
+ public void setInviteeId(String inviteeId) {
+ this.inviteeId = inviteeId;
+ }
+
+ public String getInviteeName() {
+ return inviteeName;
+ }
+
+ public void setInviteeName(String inviteeName) {
+ this.inviteeName = inviteeName;
+ }
+
+ public String getTmkName() {
+ return tmkName;
+ }
+
+ public void setTmkName(String tmkName) {
+ this.tmkName = tmkName;
+ }
+
+ public String getDoctorNme() {
+ return doctorNme;
+ }
+
+ public void setDoctorNme(String doctorNme) {
+ this.doctorNme = doctorNme;
+ }
+
+ public String getNoBugProject() {
+ return noBugProject;
+ }
+
+ public void setNoBugProject(String noBugProject) {
+ this.noBugProject = noBugProject;
+ }
+
+ public String getBugProject() {
+ return bugProject;
+ }
+
+ public void setBugProject(String bugProject) {
+ this.bugProject = bugProject;
+ }
+
+ public String getExecuteProjectType() {
+ return executeProjectType;
+ }
+
+ public void setExecuteProjectType(String executeProjectType) {
+ this.executeProjectType = executeProjectType;
+ }
+
+ public String getBugProjectType() {
+ return bugProjectType;
+ }
+
+ public void setBugProjectType(String bugProjectType) {
+ this.bugProjectType = bugProjectType;
+ }
+
+ public String getConsultationProject() {
+ return consultationProject;
+ }
+
+ public void setConsultationProject(String consultationProject) {
+ this.consultationProject = consultationProject;
+ }
+
+ public String getConsultationProjectType() {
+ return consultationProjectType;
+ }
+
+ public void setConsultationProjectType(String consultationProjectType) {
+ this.consultationProjectType = consultationProjectType;
+ }
+
+ public String getNotUseProject() {
+ return notUseProject;
+ }
+
+ public void setNotUseProject(String notUseProject) {
+ this.notUseProject = notUseProject;
+ }
+
+ public String getUserCardName() {
+ return userCardName;
+ }
+
+ public void setUserCardName(String userCardName) {
+ this.userCardName = userCardName;
+ }
+
+ public Integer getExpectedLossDay() {
+ return expectedLossDay;
+ }
+
+ public void setExpectedLossDay(Integer expectedLossDay) {
+ this.expectedLossDay = expectedLossDay;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public Integer getIsPretriageCard() {
+ return isPretriageCard;
+ }
+
+ public void setIsPretriageCard(Integer isPretriageCard) {
+ this.isPretriageCard = isPretriageCard;
+ }
+
+ public String getIndication1() {
+ return indication1;
+ }
+
+ public void setIndication1(String indication1) {
+ this.indication1 = indication1;
+ }
+
+ public String getIndication2() {
+ return indication2;
+ }
+
+ public void setIndication2(String indication2) {
+ this.indication2 = indication2;
+ }
+
+ public Integer getIndicationLevel() {
+ return indicationLevel;
+ }
+
+ public void setIndicationLevel(Integer indicationLevel) {
+ this.indicationLevel = indicationLevel;
+ }
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java
new file mode 100644
index 0000000..67fab6d
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.user;
+
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛
+ **/
+@Data
+public class DUserTagDto {
+ private String tagName;
+ private String tagTypeId;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
new file mode 100644
index 0000000..53985c7
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
@@ -0,0 +1,135 @@
+package com.hz.his.feign.download;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.*;
+import com.hz.his.dto.user.DUserChangeLogDto;
+import com.hz.his.dto.user.DUserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * PHIS-涓嬭浇涓績
+ */
+@FeignClient(name="phi-download-service",path = "/phis-download",contextId = "d-phi-download")
+public interface DFileDownloadService {
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害鏁版嵁*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍖荤敓鎺掔彮*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒�*/
+ @PostMapping(value = "/report/export/coupon/list")
+ Result exportCoupon(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒哥爜*/
+ @PostMapping(value = "/report/export/coupon/number/list")
+ Result exportCouponNumber(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒掓墸璁板綍*/
+ @PostMapping(value = "/report/export/deduction/list")
+ Result exportDeduction(@RequestBody DDeductionDto dDeductionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/list")
+ Result exportEmployee(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐瑙掕壊鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/role/list")
+ Result exportEmployeeRole(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-姒傝璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/list")
+ Result exportOrder(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏄庣粏璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/detail/list")
+ Result exportOrderDetail(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鑽璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/drug/list")
+ Result exportOrderDrug(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏀舵璁板綍*/
+ @PostMapping(value = "/report/export/pay/detail/list")
+ Result exportPayDetail(@RequestBody DPayDetailDto dPayDetailDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰鍒嗙被*/
+ @PostMapping(value = "/report/export/project/type/list")
+ Result exportProjectType(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SKU*/
+ @PostMapping(value = "/report/export/project/sku/list")
+ Result exportProjectSku(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SPU*/
+ @PostMapping(value = "/report/export/project/spu/list")
+ Result exportProjectSpu(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害椤圭洰*/
+ @PostMapping(value = "/report/export/project/sku/appoint/list")
+ Result exportProjectSkuAppoint(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫�娆捐褰�*/
+ @PostMapping(value = "/report/export/refund/list")
+ Result exportRefund(@RequestBody DRefundDto dRefundDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娌荤枟閫氱煡鍗�*/
+ @PostMapping(value = "/report/export/treat/list")
+ Result exportTreat(@RequestBody DTreatSingleDto dTreatSingleDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-瀵煎尰璁㈠崟*/
+ @PostMapping(value = "/report/export/guide/visit/order/list")
+ Result exportGuideOrder(@RequestBody DVisitOrderDto dVisitOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒拌璁板綍*/
+ @PostMapping(value = "/report/export/visit/record/list")
+ Result exportVisitRecord(@RequestBody DVisitRecordDto dVisitRecordDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍥炶璁板綍*/
+ @PostMapping(value = "/report/export/return/visit/list")
+ Result exportReturnVisit(@RequestBody DReturnVisitDto dReturnVisitDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒濊瘖鍗′俊鎭�*/
+ @PostMapping(value = "/report/export/user/first/treat/card/list")
+ Result exportFirstTreatCard(@RequestBody DFirstTreatCardDto dFirstTreatCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-璁惧*/
+ @PostMapping(value = "/report/export/device/list")
+ Result exportDevice(@RequestBody DDeviceDto dDeviceDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍌ㄥ�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/store/list")
+ Result exportStore(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-澧炲�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/increment/list")
+ Result exportIncrement(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绉垎鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/integral/list")
+ Result exportIntegral(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫氳瘽璁板綍*/
+ @PostMapping(value = "/report/export/tel/log/list")
+ Result exportTelLog(@RequestBody DTelLogDto dTelLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绛夌骇鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/level/list")
+ Result exportLevelChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤鹃棶鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/adviser/list")
+ Result exportAdviserChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐘舵�佸彉鍖�*/
+ @PostMapping(value = "/report/export/user/change/log/status/list")
+ Result exportStatusChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鎶曡瘔璁板綍*/
+ @PostMapping(value = "/report/export/complaint/list")
+ Result exportComplaint(@RequestBody DComplaintDto dComplaintDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍜ㄨ璁板綍*/
+ @PostMapping(value = "/report/export/consultation/list")
+ Result exportConsultation(@RequestBody DConsultationDto dConsultationDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-淇冮攢*/
+ @PostMapping(value = "/report/export/promotion/list")
+ Result exportPromotion(@RequestBody DPromotionDto dPromotionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍗￠」*/
+ @PostMapping(value = "/report/export/card/list")
+ Result exportCard(@RequestBody DCardDto dCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娲诲姩*/
+ @PostMapping(value = "/report/export/activity/list")
+ Result exportActivity(@RequestBody DActivityDto dActivityDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢ㄦ埛鏁版嵁*/
+ @PostMapping(value = "/report/export/user/list")
+ Result exportUser(@RequestBody DUserDto dUserDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-杞禒鏁版嵁*/
+ @PostMapping(value = "/report/export/user/turn/list")
+ Result exportTurn(@RequestBody DTurnDto dTurnDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍟嗗搧-鑽搧鏁版嵁*/
+ @PostMapping(value = "/report/export/consumables/list")
+ Result exportConsumables(@RequestBody DConsumablesDto dConsumablesDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙澶勬柟*/
+ @PostMapping(value = "/report/export/treat/prescription/list")
+ Result exportPrescription(@RequestBody DPrescriptionDto dPrescriptionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙鐥呭巻*/
+ @PostMapping(value = "/report/export/treat/medical/list")
+ Result exportMedical(@RequestBody DMedicalRecordDto dMedicalRecordDto);
+
+
+
+}
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
index d8ab8f4..bb6528e 100644
--- 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
@@ -32,4 +32,6 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
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 500b7d8..a7127cf 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
@@ -39,4 +39,6 @@
/**鎿嶄綔浜�*/
private String operatorId;
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
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
index b651c5f..bf56620 100644
--- 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
@@ -34,6 +34,8 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
public List<String> getShopIdList() {
if(shopIdList == null){
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
index 9bf67f6..8560f79 100644
--- 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
@@ -19,6 +19,8 @@
private String endTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
/**涓氱哗绫诲瀷-闂ㄥ簵鏃ョ幇閲戜笟缁�*/
public static final String TYPE_DAY_CASH= "day_cash";
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
index 8090bbb..b9e5a65 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
@@ -22,4 +22,7 @@
private List<String> employeeIdList;
/**绛夌骇鍒楄〃*/
private List<String> memberLevelList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
+
}
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
index 9a0db20..153efc7 100644
--- 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
@@ -161,5 +161,10 @@
@PostMapping("/admin/operational/month/deduction/list")
Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * SPA浠ｇ帇涓氱哗鎶ヨ〃
+ */
+ @PostMapping("/admin/operational/channels/deal/dw/spa")
+ Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);
}
--
Gitblit v1.8.0