From d057f70a60c8c066838bd0d0779ffbaa9a16c1ab Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 18 十一月 2022 17:43:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java | 20 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java | 19 +++++++++
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java | 22 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java | 20 ++++++++++
4 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
new file mode 100644
index 0000000..3609e6b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.treat;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛鍏宠仈鍛樺伐
+ * */
+@Data
+public class TreatAfterEmployeeDto {
+ /**浜哄憳绫诲瀷,涓嶄紶榛樿鍖荤敓绫诲瀷*/
+ private Integer type;
+ /**浜哄憳鏍囪瘑(鍛樺伐鏍囪瘑)*/
+ private String commonId;
+
+ /**浜哄憳绫诲瀷-鍖荤敓*/
+ public static final Integer TYPE_DOCTOR = 0;
+ /**浜哄憳绫诲瀷-鎶ゅ＋*/
+ public static final Integer TYPE_NURSE = 1;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
new file mode 100644
index 0000000..a19e73d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.treat;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛鍏宠仈椤圭洰
+ * */
+@Data
+public class TreatAfterProjectDto {
+ /**椤圭洰鍏宠仈绫诲瀷,涓嶄紶榛樿椤圭洰sku*/
+ private Integer type;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+
+ /**绫诲瀷-椤圭洰SKU*/
+ public static final Integer TYPE_SKU = 0;
+ /**绫诲瀷-椤圭洰SPU*/
+ public static final Integer TYPE_SPU = 1;
+ /**绫诲瀷-椤圭洰鎵�灞炴湯绾у垎绫�*/
+ public static final Integer TYPE_TYPE = 2;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
new file mode 100644
index 0000000..7f90e80
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.treat;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛
+ * */
+@Data
+public class TreatAfterVideoDto extends PageDto {
+ /*******************2022-11-17:鏉′欢鏆傛椂鏄苟涓旂殑鍏崇郴***************************/
+ /**浜哄憳鏉′欢闆嗗悎*/
+ private List<TreatAfterEmployeeDto> employeeDtoList;
+ /**椤圭洰鏉′欢闆嗗悎*/
+ private List<TreatAfterProjectDto> projectDtoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java
new file mode 100644
index 0000000..e1206fd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.phisAdmin;
+
+import com.hx.resultTool.Result;
+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;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 鏈悗瑙嗛
+ */
+@FeignClient(name="phis-service",contextId = "phis-treat-after-video")
+public interface STreatService {
+ /**
+ * 鏈悗瑙嗛鏌ヨ鎺ュ彛
+ */
+ @RequestMapping("/foreign/treat/after/video/list")
+ Result treatAfterVideoList(@RequestBody TreatAfterVideoDto treatAfterVideoDto);
+}
--
Gitblit v1.8.0