From f31ae0176ba124a2a39121584f5c39c3de932157 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 12:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java | 6 +-
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java | 96 ++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java | 46 +++++++++++++++
3 files changed, 145 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
new file mode 100644
index 0000000..19688b9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
@@ -0,0 +1,46 @@
+package com.hz.his.dto.visitOrder;
+
+import lombok.Data;
+
+/**
+ * 鍒拌鎿嶄綔dto
+ * @USER: fhx
+ * @DATE: 2024/4/11
+ **/
+@Data
+public class VisitOrderDto {
+
+ /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+ private Integer opType;
+ /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
+ private String loginRoleId;
+
+ /** 鍒拌璁㈠崟id */
+ private String id;
+ private String orderId;
+ /** 鍒嗚瘖椤鹃棶id */
+ private String adviserId;
+ /** 鍒嗚瘖鍖荤敓id */
+ private String doctorId;
+ /** 鍒嗚瘖鎶ゅ＋id */
+ private String nurseId;
+ /** */
+ private Integer type;
+ /** 鐘舵�� */
+ private Integer status;
+ /** 绛夊緟鏃堕棿 */
+ private String waitingTime;
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+ /** 澶囨敞 */
+ private String remarks;
+ /** 鍙栨秷鍑瘉鏂囦欢璺緞 */
+ private String annexUrl;
+ /** 鏄惁璁板綍鍒犻櫎 */
+ private Integer isMarkDel;
+ /** 椤圭洰json瀛楃 */
+ private String projectJson;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java
similarity index 82%
rename from phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java
index 5d65f3c..13480da 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java
@@ -10,11 +10,11 @@
/**
* mot鎵爜鍒拌
*/
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
-public interface SVisitOrderService {
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-mot-visit")
+public interface SPhisMotVisitService {
/**
* mot鎵爜鍒拌
*/
- @RequestMapping("/visit/order/mot/scanCode")
+ @RequestMapping("/mot/visit/scan/code/arrival")
Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java
new file mode 100644
index 0000000..b15f4f2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java
@@ -0,0 +1,96 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.appointment.AppointmentDto;
+import com.hz.his.dto.visitOrder.VisitOrderDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * mot鎵爜鍒拌
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
+public interface SPhisVisitOrderService {
+
+ /** 鍒板簵 */
+ @RequestMapping("/visit/order/arrival")
+ Result arrival(@RequestBody VisitOrderDto dto);
+ /** 鍒嗚瘖 */
+ @RequestMapping("/visit/order/triage")
+ Result triage(@RequestBody VisitOrderDto dto);
+ /** 瀹㈡埛绂诲紑 */
+ @RequestMapping("/visit/order/leave")
+ Result leave(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬫帴寰� */
+ @RequestMapping("/visit/order/reception")
+ Result reception(@RequestBody VisitOrderDto dto);
+ /** 鎺ュ緟缁撴潫 */
+ @RequestMapping("/visit/order/reception/end")
+ Result receptionEnd(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬮潰璇� */
+ @RequestMapping("/visit/order/examine")
+ Result examine(@RequestBody VisitOrderDto dto);
+ /** 缁撴潫闈㈣瘖 */
+ @RequestMapping("/visit/order/examine/end")
+ Result examineEnd(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬫湳鍓嶅噯澶� */
+ @RequestMapping("/visit/order/preoperative")
+ Result preoperative(@RequestBody VisitOrderDto dto);
+ /** 鏄惁鍗搁夯锛堟姢澹彂閫侊級 */
+ @RequestMapping("/visit/order/discharge/noti")
+ Result dischargeNotify(@RequestBody VisitOrderDto dto);
+ /** 鏄惁鍗搁夯锛圡IC鍙戦�侊級 */
+ @RequestMapping("/visit/order/mic/discharge/noti")
+ Result dischargeMicNotify(@RequestBody VisitOrderDto dto);
+ /** 缁撴潫鏈墠鍑嗗 */
+ @RequestMapping("/visit/order/preoperative/end")
+ Result preoperativeEnd(@RequestBody VisitOrderDto dto);
+ /** 缁撴潫鏈墠骞跺紑濮嬫不鐤� */
+ @RequestMapping("/visit/order/endPreAndStartTreat")
+ Result endPreAndStartTreat(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬫不鐤� */
+ @RequestMapping("/visit/order/treat")
+ Result treat(@RequestBody VisitOrderDto dto);
+ /** 缁撴潫娌荤枟 */
+ @RequestMapping("/visit/order/treat/end")
+ Result treatEnd(@RequestBody VisitOrderDto dto);
+ /** 缁撴潫娌荤枟骞跺紑濮嬫湳鍚� */
+ @RequestMapping("/visit/order/endTreatAndStartPost")
+ Result endTreatAndStartPost(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬫湳鍚� */
+ @RequestMapping("/visit/order/after_operation")
+ Result afterOperation(@RequestBody VisitOrderDto dto);
+ /** 寮�濮嬫湳鍚� */
+ @RequestMapping("/visit/order/after_operation/end")
+ Result afterOperationEnd(@RequestBody VisitOrderDto dto);
+ /** 鎾ゅ洖涓婄骇鐘舵�� */
+ @RequestMapping("/visit/order/to_withdraw/status")
+ Result withdraw(@RequestBody VisitOrderDto dto);
+ /** 閫氱煡MIC鍒嗛厤闈㈣瘖 */
+ @RequestMapping("/visit/order/mic/notice")
+ Result noticeMIC(@RequestBody VisitOrderDto dto);
+ /** 绋嶅悗鍑犲垎閽熷嵏楹� */
+ @RequestMapping("/visit/order/waiting/hemp")
+ Result waitingHemp(@RequestBody VisitOrderDto dto);
+ /** MIC鐩存帴淇敼棰勭害鏃堕棿鎴栬�呭彇娑堣鍗� */
+ @RequestMapping("/visit/order/mic/preStartTime/edit")
+ Result micPreStartTimeEdit(@RequestBody VisitOrderDto dto);
+ /** 淇敼璁㈠崟 */
+ @RequestMapping("/visit/order/orderProject/edit")
+ Result orderProjectEdit(@RequestBody VisitOrderDto dto);
+ /** 鏍规嵁棰勭害id鑾峰彇棰勭害璁㈠崟 */
+ @RequestMapping("/visit/order/get/appointment")
+ Result getAppointment(@RequestBody VisitOrderDto dto);
+ /** 鏄惁鏁烽夯锛圡IC鍙戦�侊級 */
+ @RequestMapping("/visit/order/mic/shima/noti")
+ Result Shimatify(@RequestBody VisitOrderDto dto);
+ /** 鏄惁鏁烽夯锛堟姢澹彂閫侊級 */
+ @RequestMapping("/visit/order/shima/noti")
+ Result shimaNotify(@RequestBody VisitOrderDto dto);
+ /** 绋嶅悗鍑犲垎閽熸暦楹� */
+ @RequestMapping("/visit/order/waiting/shima")
+ Result waitingShima(@RequestBody VisitOrderDto dto);
+
+
+}
--
Gitblit v1.8.0