diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java similarity index 100% rename from doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java rename to doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java index 814704b..6f161dc 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java @@ -1,13 +1,11 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import doctor.service.InquiryService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -20,16 +18,23 @@ import static com.github.pagehelper.page.PageMethod.startPage; * @Date: 2024-01-12 19:09 */ @RestController -@RequestMapping("/user/inquiry/verify/v1") +@RequestMapping("/user/inquiry") public class InquiryController { @Autowired private InquiryService inquiryService; //历史问诊记录列表 - @GetMapping("/findHistoryInquiryRecord") + @GetMapping("/verify/v1/findHistoryInquiryRecord") public HealthR> findHistoryInquiryRecord(@RequestParam Integer page,@RequestParam Integer count){ startPage(page,count); List inquiryDetailsRecordVoList = inquiryService.findHistoryInquiryRecord(); return HealthR.ok(inquiryDetailsRecordVoList); } + @GetMapping("/v1/findDoctorInfo") + public HealthR findDoctorInfo(@RequestHeader Integer userId, + @RequestHeader String sessionId, + @RequestParam Integer doctorId) { + DoctorVo doctorVo = inquiryService.findDoctorInfo(doctorId); + return HealthR.ok(doctorVo); + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/Comment.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/Comment.java new file mode 100644 index 0000000..cc8e148 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/Comment.java @@ -0,0 +1,15 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Comment { + private String nickName; + private String headPic; + private String content; + private Long commentTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorReceiveGift.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorReceiveGift.java new file mode 100644 index 0000000..9427dfc --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorReceiveGift.java @@ -0,0 +1,16 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DoctorReceiveGift { + private Integer worth; + private Integer receiveNum; + private String giftPic; + private String giftName; + private String meaning; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java index 3166dc9..0f1f4d9 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @BelongsProject: Medical_Treatment * @BelongsPackage: doctor.domain.vo @@ -22,6 +24,12 @@ public class DoctorVo { private double praise; private Integer serverNum; private Integer servicePrice; + private Integer followFlag; + private String personalProfile; + private String goodField; + private Integer commentNum; private Integer praiseNum; private Integer badNum; + private List doctorReceiveGiftList; + private List commentVoList; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java index 41e58c6..111988f 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java @@ -1,5 +1,6 @@ package doctor.service; +import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import java.util.List; @@ -12,4 +13,6 @@ import java.util.List; */ public interface InquiryService { List findHistoryInquiryRecord(); + + DoctorVo findDoctorInfo(Integer doctorId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java index 00d24bc..2e849c8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java @@ -1,6 +1,7 @@ package doctor.service.impl; import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.domain.vo.DoctorVo; import doctor.domain.vo.InquiryDetailsRecordVo; import doctor.mapper.InquiryMapper; import doctor.service.InquiryService; @@ -26,4 +27,10 @@ public class InquiryServiceImpl implements InquiryService { List inquiryDetailsRecordVos = ConvertUtil.entityToVoList(inquiryDetailsRecordEntity, InquiryDetailsRecordVo.class); return inquiryDetailsRecordVos; } + + @Override + public DoctorVo findDoctorInfo(Integer doctorId) { + + return null; + } }