From 860c4e691821197e05e12cc6288a36f89c410181 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 07 四月 2024 15:48:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java | 2 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java | 31 +++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 4 ++
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java | 24 ++++++++++++
4 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
index a479b41..25fea90 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
@@ -56,5 +56,7 @@
/** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
private Integer realMzTime;
+ /** 鏄惁褰撳ぉ鍒嗛殧涓婁笅鍗堝尮閰�(榛樿false) */
+ private boolean isDaySpace = false;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java
new file mode 100644
index 0000000..59f0681
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.appointment;
+
+import lombok.Data;
+
+/**
+ * CRM鑷姪棰勭害dto
+ * @USER: fhx
+ * @DATE: 2024/4/7
+ **/
+@Data
+public class AppointmentCrmSelfDto {
+
+ /** 鐢ㄦ埛鏍囪瘑 */
+ private String userId;
+ /** 闂ㄥ簵鏍囪瘑 */
+ private String shopId;
+ /** 鍖荤敓鏍囪瘑 */
+ private String doctorId;
+ /** 棰勭害鏃堕棿(yyyy-MM-dd) */
+ private String dateTime;
+ /** 棰勭害椤圭洰json */
+ private String projectJson;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java
new file mode 100644
index 0000000..0e898e7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java
@@ -0,0 +1,31 @@
+package com.hz.his.feign.service.platform.appointment;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.appointment.AppointmentAutoMateDto;
+import com.hz.his.dto.user.UserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 棰勭害鑷姩鍖归厤service
+ * @USER: fhx
+ * @DATE: 2023/7/6
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-appointment-crm-self")
+public interface SPhipCrmSelfService {
+
+ /** 棰勭害椤甸潰鏁版嵁 */
+ @PostMapping("/appointment/crm/self/page/data")
+ Result pageData(@RequestBody UserDto dto);
+
+ /** 鐢ㄦ埛鑷姪棰勭害鍒楄〃 */
+ @PostMapping("/appointment/crm/self/self/list")
+ Result selfList(@RequestBody UserDto dto);
+
+ /** 鐢ㄦ埛鑷姪棰勭害椤圭洰 */
+ @PostMapping("/appointment/crm/self/project/list")
+ Result projectList(@RequestBody UserDto dto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
index 683645f..f05f4ac 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -13,6 +13,10 @@
private String itemId;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
private String itemName;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-绫诲瀷*/
+ private String itemType;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-缂栧彿*/
+ private String itemCode;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
private BigDecimal total;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
--
Gitblit v1.8.0