From 5865942131098759a4a2399c946f4ca23c3624ea Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 04 六月 2024 10:59:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java | 18 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 3 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java | 21 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 3 -
5 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 6d9e6b9..3907d31 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -23,9 +23,8 @@
/**鍒嗙被鏍囪瘑*/
private String typeId;
private List<String> typeIdList;
- //appid
+ /**appid*/
private String appId;
-
public Integer getPageNum() {
if(this.pageNum == null || this.pageNum < 0){
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
new file mode 100644
index 0000000..17a2273
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.appointment.AppointmentProjectFindVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author CJH
+ **/
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "read-appointment")
+public interface SAppointmentService {
+
+ /** 鑾峰彇鐢ㄦ埛鏃堕棿鍐呴绾︾殑椤圭洰 */
+ @PostMapping("/appointment/user/project/list")
+ Result userAppointmentProjectList(@RequestBody AppointmentProjectFindVo appointmentProjectFindVo);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index b0e0a1e..52f9a6d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.PageDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.project.ProjectDto;
+import com.hz.his.vo.project.ProjectFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -48,7 +49,7 @@
* @return Result
*/
@PostMapping(value = "/project/page/list")
- Result getProjectList(@RequestBody PageDto pageDto);
+ Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
/**
* 鑾峰彇椤圭洰闂ㄥ簵浠锋牸鍒楄〃
diff --git a/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java
new file mode 100644
index 0000000..e27804a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java
@@ -0,0 +1,21 @@
+package com.hz.his.vo.appointment;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author CJH
+ */
+@Data
+public class AppointmentProjectFindVo extends PageDto {
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**棰勭害鏃堕棿-寮�濮�*/
+ private Date preStartTime;
+ /**棰勭害鏃堕棿-缁撴潫*/
+ private Date preEndTime;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java
new file mode 100644
index 0000000..fcfc7ae
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class ProjectFindVo extends PageDto {
+
+ /**绫诲瀷*/
+ private Integer type;
+ /**鏄惁涓婁笅鏋�-榛樿涓婃灦*/
+ private Integer isUp = 1;
+
+
+}
--
Gitblit v1.8.0