From d5f27d8192422574047b7c557538c595088284a6 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 09 十一月 2023 17:45:01 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiJiDataService.java | 21 +++++++
phis-feign/src/main/java/com/hz/his/dto/meiji/MeiJiDataDto.java | 15 +++++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java | 16 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 50 ++++++++++++----
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 8 ++
phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java | 4 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java | 6 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java | 4 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 25 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java | 7 ++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 20 ++++++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 2
12 files changed, 159 insertions(+), 19 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
index e421cb2..b8624b8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -12,9 +12,13 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
- /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭～椤�*/
private Integer type;
- /**瀹℃牳鍞竴鏍囪瘑*/
+ /**瀹℃牳绫诲瀷鍞竴瀛楃涓� -蹇呭～椤�*/
+ private String typeStr;
+ /**瀹℃牳鏍囬 -蹇呭～椤�*/
+ private String title;
+ /**瀹℃牳鍞竴鏍囪瘑 -蹇呭～椤�*/
private String uniqueId;
/**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/meiji/MeiJiDataDto.java b/phis-feign/src/main/java/com/hz/his/dto/meiji/MeiJiDataDto.java
new file mode 100644
index 0000000..b5f8090
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/meiji/MeiJiDataDto.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.meiji;
+
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/11/9
+ **/
+@Data
+public class MeiJiDataDto {
+
+ /** 缇庨檯鐨偆妗ｆid */
+ private String mjSkinReportId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 9acf237..9e6e75f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.micro;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java
index 2107ece..844dd0a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java
@@ -32,6 +32,8 @@
private String platformType;
/** 鎬讳环(閫昏緫绱鍚庡～鍏咃紝闈炰紶鍙備娇鐢�) */
private BigDecimal totalPrice;
+ /** 鎶ヤ环椤圭洰-鍥剧墖璺緞 */
+ private String bpImgUrl;
/** 鐨偆妗ｆ鏍囪瘑(MjSkinReport) */
private String pfDaId;
@@ -44,6 +46,8 @@
/** 浣撴�佸褰�-鍥剧墖璺緞 */
private String ttSxImgUrl;
+
+
/** 鎿嶄綔浜烘爣璇� */
private String opId;
/** 鎿嶄綔浜哄悕绉� */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
new file mode 100644
index 0000000..5a07d54
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReportDto {
+ /**鍛樺伐鏍囪瘑*/
+ private String userId;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
new file mode 100644
index 0000000..a3c2d8b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReportListDto {
+
+ private List<UserReportDto> list;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
index b815fe0..e8c3c99 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -38,5 +38,12 @@
Result getSendingRecordsList(@RequestBody(required = false) UserDto dto);
+ /**
+ * 鑾峰彇璋冩煡闂嵎鎺ㄩ�佽褰曡鎯�
+ * @param dto 鐢ㄦ埛鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/sending/records/see")
+ Result see(@RequestBody(required = false) UserDto dto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
index bd0b606..ef698c9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -30,4 +30,10 @@
*/
@PostMapping(value = "/employee/search/acquisition/link")
Result searchAcquisitionLink(@RequestBody EmployeeDto employeeDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-浼佷笟寰俊鍙戦�侀偖浠堕�氱煡
+ */
+ @PostMapping(value = "/employee/sent/email/notice")
+ Result senEmailNotice(@RequestBody EmployeeDto employeeDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiJiDataService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiJiDataService.java
new file mode 100644
index 0000000..542d23a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiJiDataService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.meiji.MeiJiDataDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 缇庨檯鏁版嵁
+ * @USER: fhx
+ * @DATE: 2023/11/9
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-meiji-data")
+public interface SPhipMeiJiDataService {
+
+ /** 鍒楄〃 */
+ @PostMapping(value = "/meiji/data/resource/file/list")
+ Result resourceFileList(@RequestBody MeiJiDataDto dto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
index 2c95968..9f03e99 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -42,6 +42,8 @@
@PostMapping(value = "/micro/record/del")
Result del(@RequestBody MicroRecordDto dto);
-
+ /** crm鏌ョ湅璁板綍璇︽儏 */
+ @PostMapping(value = "/micro/record/crm/see")
+ Result crmSee(@RequestBody MicroRecordDto dto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index 9cbdffb..7b91cfa 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -60,18 +60,6 @@
/**
- * 浼氬憳娌荤枟鎯呭喌鎬昏〃
- */
- @PostMapping("/admin/doctor/sale/report/treat/detail/list")
- Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);
-
- /**
- * 閲嶇偣鍝侀」鏁版嵁
- */
- @PostMapping("/admin/doctor/sale/report/project/items/list")
- Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);
-
- /**
* 鍒嗙被娌荤枟娓楅�忔儏鍐�
*/
@PostMapping("/admin/doctor/sale/report/type/permeate/list")
@@ -83,14 +71,48 @@
@PostMapping("/admin/doctor/sale/report/project/therapy/multiple")
Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍖荤敓鍒濆璇婄畝鎶�
+ */
+ @PostMapping("/admin/doctor/sale/report/first/treat/list")
+ Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/detail/list/V2")
+ Result treatDetailListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/project/items/list/V2")
+ Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 瀹㈡埛棰勭害鍒拌鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/appoint/list/V2")
+ Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+ /*******************************涓嬮潰鎺ュ彛3.0搴熷純*********************************/
+ /**
+ * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/detail/list")
+ Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/project/items/list")
+ Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 瀹㈡埛棰勭害鎯呭喌
*/
@PostMapping("/admin/doctor/sale/report/appoint/list")
Result appointList(@RequestBody EmployeeReportDto employeeReportDto);
-
-
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
new file mode 100644
index 0000000..3ee2464
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.CxjReportReqDto;
+import com.hz.his.dto.report.UserReportListDto;
+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-user-data")
+public interface BiUserService {
+
+ /**
+ * 鎴愪氦鐜伴噾
+ */
+ @PostMapping("/admin/user/report/cash/money")
+ Result cashTotalList(@RequestBody UserReportListDto userReportListDto);
+
+
+}
--
Gitblit v1.8.0