From 060ae34615f569d95cc1e12a5b4e8e95f6fcd628 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 29 三月 2024 11:51:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java                     |   60 +++++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java |   21 +++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java  |   24 ++++++
 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java                           |  127 +++++++++++++++++++++++++++++++
 4 files changed, 232 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
new file mode 100644
index 0000000..a479b41
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
@@ -0,0 +1,60 @@
+package com.hz.his.dto.appointment;
+
+import lombok.Data;
+
+/**
+ * 棰勭害棰勭害dto
+ * @USER: fhx
+ * @DATE: 2024/3/27
+ **/
+@Data
+public class AppointmentAutoMateDto {
+
+    /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+    private Integer opType;
+    /** 鎿嶄綔浜烘爣璇� */
+    private String opId;
+    /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+    private String opRoleId;
+
+    /** 鐢ㄦ埛id */
+    private String userId;
+    /** 闂ㄥ簵id */
+    private String shopId;
+    /** 鍖荤敓id */
+    private String doctorId;
+    /** 棰勭害id */
+    private String aptId;
+
+    /** 灏辫瘖绫诲瀷 */
+    private String visitType;
+    /** 棰勭害绫诲瀷 */
+    private Integer appType;
+    /** 鏄惁杞枟 */
+    private Integer isSwitch;
+    /** 鏄惁MIC鍚屾剰 */
+    private Integer isMicApprove;
+    /** 鏄惁鐗规畩瀹㈡埛 */
+    private Integer specialUser;
+
+    /** 棰勭害椤圭洰json瀛楃涓� */
+    private String projectJson;
+
+    /** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
+    private String arriveDate;
+    /** 寮�濮嬫椂闂� */
+    private String startTime;
+    /** 缁撴潫鏃堕棿 */
+    private String endTime;
+
+    /** 娌熼�氭椂闀�(鍒�) */
+    private Integer comDuration;
+    /** 鏁烽夯鏃堕暱(鍒�) */
+    private Integer palsyDuration;
+    /** 绛夊緟鏃堕暱(鍒�) */
+    private Integer waitDuration;
+    /** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
+    private Integer realMzTime;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
new file mode 100644
index 0000000..18ff523
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
@@ -0,0 +1,127 @@
+package com.hz.his.dto.appointment;
+
+import lombok.Data;
+
+/**
+ * 棰勭害V2鐗坉to
+ * @USER: fhx
+ * @DATE: 2024/3/27
+ **/
+@Data
+public class AppointmentV2Dto {
+
+    /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+    private Integer opType;
+    /** 鎿嶄綔浜烘爣璇� */
+    private String opId;
+    /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+    private String opRoleId;
+
+    /** 棰勭害id */
+    private String id;
+    private String aptId;
+    /** 鐢ㄦ埛id */
+    private String userId;
+    /** 闂ㄥ簵id */
+    private String shopId;
+    /** 鍖荤敓id */
+    private String doctorId;
+    /** 棰勭害椤鹃棶id */
+    private String corpUserId;
+    /** 娲诲姩鏃ユ湡id */
+    private String activityDayId;
+
+
+    /** 娣诲姞妯″紡(Appointment) */
+    private Integer addMode;
+    /** 灏辫瘖绫诲瀷 */
+    private String visitType;
+    /** 棰勭害绫诲瀷 */
+    private Integer appType;
+    /** 鏄惁杞枟 */
+    private Integer isSwitch;
+    /** 鏄惁MIC鍚屾剰 */
+    private Integer isMicApprove;
+    /** 鏄惁鐗规畩瀹㈡埛 */
+    private Integer specialUser;
+    /** 鏄惁鏈嶅姟鍖荤敓瀹夋帓 */
+    private Integer obeyTime;
+    /** 鏄惁鏈嶅姟鏃堕棿瀹夋帓 */
+    private Integer obeyDoctor;
+    /** 鏄惁鍙戦�佺煭淇�(0:鍕鹃��,1:涓嶉��) */
+    private Integer isSendMsg;
+    /** 鏄惁鍙戦�佸埌搴楁彁閱掔煭淇℃彁閱�(0:鍚�,1:鏄�) */
+    private Integer isArriveSendMsg;
+    /** 鍖归厤鏃堕棿绫诲瀷锛�1姝ｅ父;2寮�濮嬫椂闂村噺5鍒嗛挓;3缁撴潫鏃堕棿鍑�5鍒嗛挓 */
+    private Integer handleNum;
+    /** 鏄惁鍒板簵 */
+    private Integer isArrive;
+
+    /** 椤圭洰id(澶氫釜閫楀彿鍒嗛殧) */
+    private String projectIds;
+    /** 椤圭洰鍚嶇О(澶氫釜閫楀彿鍒嗛殧) */
+    private String projectNames;
+    /** 鍥剧墖(澶氫釜閫楀彿鍒嗛殧) */
+    private String imgUrls;
+    /** 澶囨敞 */
+    private String remark;
+    /** 椁愰澶囨敞 */
+    private String mealsRemark;
+
+    /** 棰勭害椤圭洰json瀛楃涓� */
+    private String projectJson;
+    /** 娌荤枟鏃堕棿json瀛楃涓� */
+    private String zlTimeJson;
+    /** 璁惧鏃堕棿json瀛楃涓� */
+    private String deviceTimeJson;
+
+    /** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
+    private String arriveDate;
+    /** 寮�濮嬫椂闂� */
+    private String startTime;
+    /** 缁撴潫鏃堕棿 */
+    private String endTime;
+
+    /** 鏁烽夯鏃堕暱(鍒�) */
+    private Integer palsyDuration;
+    /** 绛夊緟鏃堕暱(鍒�) */
+    private Integer waitDuration;
+    /** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
+    private Integer realMzTime;
+    /** 绛夊緟鏃堕暱(鍒�) */
+    private Integer waitTime;
+
+
+    /** 娌熼�氭椂闀�(鍒�) */
+    private Integer gtTime;
+    /** 闈㈣瘖鏃堕暱(鍒�) */
+    private Integer mzTime;
+    /** 楹绘暦鏃堕暱(鍒�) */
+    private Integer mfTime;
+    /** 鏈墠鏃堕暱(鍒�) */
+    private Integer sqTime;
+    /** 娌荤枟鏃堕暱(鍒�) */
+    private Integer zlTime;
+    /** 鍖荤敓娌荤枟鏃堕暱(鍒�) */
+    private Integer doctorZlTime;
+
+    /** 鐪熷疄娌熼�氭椂闀� */
+    private Integer realComDuration;
+    /** 鐪熷疄闈㈣瘖鏃堕暱 */
+    private Integer realDocComDuration;
+    /** 鐪熷疄棰勭害鏃堕暱 */
+    private Integer realDuration;
+    /** 鐪熷疄鎵嬬画鏃堕暱 */
+    private Integer realProDuration;
+    /** 鐪熷疄娌荤枟鏃堕暱 */
+    private Integer realTreatDuration;
+    /** 鐪熷疄鍑嗗鏃堕暱 */
+    private Integer realReadyDuration;
+    /** 鐪熷疄绛夊緟鏃堕暱 */
+    private Integer realWaitDuration;
+    /** 鐪熷疄楹绘暦鏃堕暱 */
+    private Integer realPalsyDuration;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java
new file mode 100644
index 0000000..d14ce24
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java
@@ -0,0 +1,21 @@
+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.appointment.AppointmentCrmAddDto;
+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-auto-mate")
+public interface SPhipAppAutoMateService {
+
+    /** 鑷姩鍖归厤 - 娣峰悎椤圭洰 */
+    @PostMapping("/appointment/autoMate/addApply/blend")
+    Result addApplyBland(@RequestBody AppointmentAutoMateDto dto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java
new file mode 100644
index 0000000..0066f54
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform.bi.poly;
+
+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 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-polymerize-service", path = "/bi-poly", contextId = "bi-poly-userDocPro")
+public interface BiUserDoctorProjectService {
+
+    /**
+     * 鍒濆鍖栨洿鏂�
+     */
+    @PostMapping("/user/doctor/relation/init/total")
+    Result init(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}

--
Gitblit v1.8.0