From 9a9e8d995ea4c95e0303b456cf6fcd4188f97366 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 14 十一月 2023 15:41:00 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SVisitOrderService.java | 20 ++++++++++ phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 31 +++++++++++++++ phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java | 30 +++++++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 8 ++++ phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 2 + phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java | 6 +- phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 2 7 files changed, 95 insertions(+), 4 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java index bf2610d..c470b2c 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java @@ -23,4 +23,6 @@ private Integer isPerformanceEmp; /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/ private List<String> roleList; + /**绫诲瀷*/ + private Integer type; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java new file mode 100644 index 0000000..0ec1c33 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java @@ -0,0 +1,31 @@ +package com.hz.his.dto.user.room; + +import lombok.Data; + +import java.util.List; + +/** + * 鐢ㄦ埛绉戝鍏崇郴杞崲浣跨敤 + * code_no_data + * */ +@Data +public class UserDoctorRoomDto { + /**鐐硅瘖绫诲瀷*/ + private Integer type; + /**鐢ㄦ埛鏍囪瘑*/ + private String userId; + /**澶囨敞*/ + private String operatorRemark; + /**绉戝鍏崇郴Json*/ + private List<UserDoctorRoomItemDto> roomList; + + /**鎿嶄綔浜轰俊鎭�*/ + private String opId; + private String opName; + private String opShopId; + private String opShopName; + private String opRoleId; + private String opRoleTypeId; + private String opRoleStr; + +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java new file mode 100644 index 0000000..19780ab --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomItemDto.java @@ -0,0 +1,30 @@ +package com.hz.his.dto.user.room; + +import lombok.Data; + +/** + * 鐢ㄦ埛绉戝鍏崇郴杞崲浣跨敤 + * code_no_data + * */ +@Data +public class UserDoctorRoomItemDto { + /**鏍囪瘑*/ + private String id; + private Integer isDel; + /**绉戝*/ + private String familiesRoomId; + /**绉戝鍚嶇О*/ + private String familiesRoomName; + /**椤鹃棶*/ + private String adviserId; + /**椤鹃棶鍚嶇О*/ + private String adviserName; + /**鍖荤敓*/ + private String doctorId; + /**鍖荤敓鍚嶇О*/ + private String doctorName; + /**鎶ゅ+*/ + private String nurseId; + /**鎶ゅ+鍚嶇О*/ + private String nurseName; +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java index 16bc710..373b6e1 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java @@ -16,7 +16,7 @@ * 缁熶竴鐢宠瀹℃牳鎺ュ彛 */ @PostMapping(value = "/common/apply") - Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto); + Result commonApply(@RequestBody MarketingTotalDto marketingTotalDto); diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java index bde5a2c..4e389ce 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java @@ -34,13 +34,13 @@ Result check(@RequestBody UserDto userDto); @PostMapping(value = "/user/query/visitCount") - Result queryVisitCount(UserDto userDto); + Result queryVisitCount(@RequestBody UserDto userDto); @PostMapping(value = "/user/query/lastVisit") - Result queryLastVisit(UserDto userDto); + Result queryLastVisit(@RequestBody UserDto userDto); @PostMapping(value = "/user/query/appointment/list") - Result queryAppointmentList(UserDto userDto); + Result queryAppointmentList(@RequestBody UserDto userDto); diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SVisitOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SVisitOrderService.java new file mode 100644 index 0000000..5e2c9e4 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SVisitOrderService.java @@ -0,0 +1,20 @@ +package com.hz.his.feign.service.phisAdmin; + +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="phis-service",contextId = "phis-visit-order") +public interface SVisitOrderService { + /** + * mot鎵爜鍒拌 + */ + @RequestMapping("/visit/order/mot/scanCode") + Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto); +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java index ad56d0c..8a4b5e2 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java @@ -4,6 +4,7 @@ import com.hz.his.dto.user.*; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.project.UserProjectDto; +import com.hz.his.dto.user.room.UserDoctorRoomDto; import net.sf.json.JSONObject; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -126,4 +127,11 @@ */ @PostMapping(value = "/user/acquisition/list") Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto); + + /** + * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖鏂板 + */ + @PostMapping(value = "/user/room/doctor/diagnosis/create") + Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto); + } \ No newline at end of file -- Gitblit v1.8.0