From a6a950766586db2d274a179904d9b3ea714a3b88 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 12 八月 2024 17:15:54 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java | 62 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java | 20 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java | 41 ++++++
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java | 156 ++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java | 14 ++
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java | 24 ++++
7 files changed, 319 insertions(+), 2 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..25fea90
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
@@ -0,0 +1,62 @@
+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;
+
+ /** 鏄惁褰撳ぉ鍒嗛殧涓婁笅鍗堝尮閰�(榛樿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/dto/appointment/AppointmentV2Dto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
new file mode 100644
index 0000000..fe2b495
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
@@ -0,0 +1,156 @@
+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 nurseId;
+ /** 棰勭害椤鹃棶id */
+ private String corpUserId;
+ /** 娲诲姩鏃ユ湡id */
+ private String activityDayId;
+ /** 闈㈣瘖鎴块棿id */
+ private String comRoomId;
+ /** 娌荤枟鎴块棿id */
+ private String treatRoomId;
+
+
+ /** 娣诲姞妯″紡(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 birthday;
+
+ /** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
+ private String arriveDate;
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+
+
+ /** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
+ private Integer realMzTime;
+ /** 绛夊緟鏃堕暱(鍒�) */
+ private Integer waitTime;
+ private Integer waitDuration;
+ /** 娌熼�氭椂闀�(鍒�) */
+ private Integer gtTime;
+ private Integer comDuration;
+ /** 闈㈣瘖鏃堕暱(鍒�) */
+ private Integer mzTime;
+ private Integer docComDuration;
+ /** 楹绘暦鏃堕暱(鍒�) */
+ private Integer mfTime;
+ private Integer palsyDuration;
+ /** 鏈墠鏃堕暱(鍒�) */
+ private Integer sqTime;
+ private Integer readyDuration;
+ /** 娌荤枟鏃堕暱(鍒�) */
+ private Integer zlTime;
+ private Integer treatDuration;
+ /** 鍖荤敓娌荤枟鏃堕暱(鍒�) */
+ 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;
+
+ /** 鍙栨秷棰勭害鍑瘉鏂囦欢璺緞 */
+ private String annexUrl;
+
+// /** 缂栬緫棰勭害 - 鏄惁鏃ユ湡鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isDayChange;
+// /** 缂栬緫棰勭害 - 鏄惁椤圭洰鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isProjectChange;
+// /** 缂栬緫棰勭害 - 鏄惁鍖荤敓鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isChangeDoctor;
+// /** 缂栬緫棰勭害 - 鏄惁鏃堕棿鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isChangeTime;
+
+
+ /** 鍚庡彴鎿嶄綔棰勭害锛氭椂闀垮瓧娈佃祴鍊肩粺涓�瀛楁 */
+ public void timeFill(){
+ this.mzTime = this.docComDuration;
+ this.gtTime = this.comDuration;
+ this.mfTime = this.palsyDuration;
+ this.sqTime = this.readyDuration;
+ this.waitTime = this.waitDuration;
+ this.zlTime = treatDuration;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
index d692ebb..79f73b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
@@ -20,7 +20,7 @@
/**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
private String minPrice;
private String maxPrice;
- /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ**/
- private Integer searchType;
+ /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ 榛樿鏌ヨ璇夋眰鍒嗙被**/
+ private Integer searchType = 1;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
index 2328b3f..d5c9b6a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentCrmAddDto;
+import com.hz.his.dto.appointment.AppointmentV2Dto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,4 +17,17 @@
/** CRM棰勭害 */
@PostMapping("/appointment/crm/app")
Result crmApp(@RequestBody AppointmentCrmAddDto dto);
+
+
+ /** 鏂板棰勭害 */
+ @PostMapping("/appointment/add")
+ Result add(@RequestBody AppointmentV2Dto dto);
+
+ /** 缂栬緫棰勭害 */
+ @PostMapping("/appointment/edit")
+ Result edit(@RequestBody AppointmentV2Dto dto);
+
+ /** 鍙栨秷棰勭害 */
+ @PostMapping("/appointment/cancel")
+ Result cancel(@RequestBody AppointmentV2Dto dto);
}
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..5735d96
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform.appointment;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.appointment.AppointmentAutoMateDto;
+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/appointment/SPhipCrmSelfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java
new file mode 100644
index 0000000..8f47c27
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfService.java
@@ -0,0 +1,41 @@
+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);
+
+ /** CRM棣栭〉棰勭害鍒楄〃 */
+ @PostMapping("/appointment/crm/self/index/app/list")
+ Result indexAppList(@RequestBody UserDto dto);
+
+ /** 鐢ㄦ埛棰勭害鍒楄〃 */
+ @PostMapping("/appointment/crm/self/list")
+ Result selfList(@RequestBody UserDto dto);
+
+ /** 鐢ㄦ埛鑷姪棰勭害椤圭洰 */
+ @PostMapping("/appointment/crm/self/project/list")
+ Result projectList(@RequestBody UserDto dto);
+
+ /** 鑷姪棰勭害鏃堕棿 */
+ @PostMapping("/appointment/crm/self/getTime")
+ Result getTime(@RequestBody AppointmentAutoMateDto dto);
+
+ /** 鑾峰彇涓�鍛ㄥ唴鍖荤敓鎺掔彮 */
+ @PostMapping("/appointment/crm/self/get/doctor/time")
+ Result getDoctorTime(@RequestBody AppointmentAutoMateDto dto);
+}
--
Gitblit v1.8.0