From de54c5916e2540eb7d8ab9c439378afa17072d87 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 02 四月 2024 15:31:33 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java | 17 ++++++++++++++++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java | 13 +++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
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
index 18ff523..f921814 100644
--- 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
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.Date;
+
/**
* 棰勭害V2鐗坉to
* @USER: fhx
@@ -26,6 +28,8 @@
private String shopId;
/** 鍖荤敓id */
private String doctorId;
+ /** 鎶ゅ＋id */
+ private String nurseId;
/** 棰勭害椤鹃棶id */
private String corpUserId;
/** 娲诲姩鏃ユ湡id */
@@ -74,6 +78,8 @@
private String zlTimeJson;
/** 璁惧鏃堕棿json瀛楃涓� */
private String deviceTimeJson;
+ /** 鐢熸棩鏃ユ湡(yyyy-MM-dd) */
+ private String birthday;
/** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
private String arriveDate;
@@ -122,6 +128,15 @@
/** 鐪熷疄楹绘暦鏃堕暱 */
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;
}
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 446257a..95307d0 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,16 @@
/** 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);
}
--
Gitblit v1.8.0