From dff9cfc66cdcb547578d99af6f5080dbdf902183 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 19:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
/dev/null | 20 ----------
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisMotVisitService.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisVisitOrderService.java | 8 +++-
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java | 17 +++++++-
4 files changed, 40 insertions(+), 25 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
index 19688b9..26a7e1e 100644
--- 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
@@ -13,7 +13,15 @@
/** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
/** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
- private String loginRoleId;
+ private String opRoleId;
+
+
+ /** 棰勭害id */
+ private String appointmentId;
+ /** 鐢ㄦ埛id */
+ private String userId;
+ /** 闂ㄥ簵id */
+ private String shopId;
/** 鍒拌璁㈠崟id */
private String id;
@@ -24,8 +32,10 @@
private String doctorId;
/** 鍒嗚瘖鎶ゅ＋id */
private String nurseId;
- /** */
- private Integer type;
+ /** 鍒拌绫诲瀷(VisitRecord) */
+ private Integer arrivalType;
+// /** */
+// private Integer type;
/** 鐘舵�� */
private Integer status;
/** 绛夊緟鏃堕棿 */
@@ -43,4 +53,5 @@
/** 椤圭洰json瀛楃 */
private String projectJson;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java
deleted file mode 100644
index 13480da..0000000
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisMotVisitService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hz.his.feign.service.platform;
-
-import com.hx.resultTool.Result;
-import com.hz.his.dto.appointment.AppointmentDto;
-import com.hz.his.dto.treat.TreatAfterVideoDto;
-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-mot-visit")
-public interface SPhisMotVisitService {
- /**
- * mot鎵爜鍒拌
- */
- @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/visit/SPhisMotVisitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisMotVisitService.java
new file mode 100644
index 0000000..0a5eb7f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisMotVisitService.java
@@ -0,0 +1,20 @@
+//package com.hz.his.feign.service.platform.visit;
+//
+//import com.hx.resultTool.Result;
+//import com.hz.his.dto.appointment.AppointmentDto;
+//import com.hz.his.dto.treat.TreatAfterVideoDto;
+//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-mot-visit")
+//public interface SPhisMotVisitService {
+// /**
+// * mot鎵爜鍒拌
+// */
+// @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/visit/SPhisVisitOrderService.java
similarity index 94%
rename from phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhisVisitOrderService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisVisitOrderService.java
index b15f4f2..9fd83af 100644
--- 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/visit/SPhisVisitOrderService.java
@@ -1,7 +1,6 @@
-package com.hz.his.feign.service.platform;
+package com.hz.his.feign.service.platform.visit;
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;
@@ -13,6 +12,11 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SPhisVisitOrderService {
+ @RequestMapping("/visit/order/user/self/visit")
+ Result userSelfVisit(@RequestBody VisitOrderDto dto);
+
+ ///////////////////////////////////////////////////////////////////////
+
/** 鍒板簵 */
@RequestMapping("/visit/order/arrival")
Result arrival(@RequestBody VisitOrderDto dto);
--
Gitblit v1.8.0