diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java index 24c18b2..258add0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java @@ -115,7 +115,7 @@ public class PatientController { return patientService.searchSickCircle(keyWord); } - @GetMapping("findPatientSickCircleList") + @GetMapping("/findPatientSickCircleList") public HealthR> findPatientSickCircleList(@RequestParam(value = "patientUserId",required = false) Integer patientUserId, @RequestParam(value = "page") Integer page, @RequestParam(value = "count") Integer count) { diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java index cb5451c..e965d29 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java @@ -39,6 +39,4 @@ public class SickCommentEntity { private String headPic; - - } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java index 2edee75..b71a1ac 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java @@ -38,4 +38,6 @@ public interface PatientMapper { List searchSickCircle(@Param("keyWord") String keyWord); + List findPatientSickCircleList(@Param("patientUserId") Integer patientUserId); + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java index b23e859..62a9441 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java @@ -63,6 +63,13 @@ public class PatientServiceImpl extends BaseController implements PatientService return HealthR.ok(list); } + @Override + public HealthR> findPatientSickCircleList(Integer patientUserId, Integer page, Integer count) { + startPage(page,count); + List sickCircleEntity = patientMapper.findPatientSickCircleList(patientUserId); + return HealthR.ok(sickCircleEntity); + } + @Override public SickCircleEntity findSickCircleInfo(Integer id) { diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java index 32bdfde..577d663 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java @@ -107,9 +107,6 @@ public class SickCircleServerImpl implements SickCircleServer { } LoginUser login = Login(); Long userid = login.getUserid(); - - - return HealthR.ok(); } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml index cd69cf9..f311dc1 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml @@ -35,14 +35,18 @@ sick_circle_comment.create_time, sick_circle_comment.patient_user_id, sick_circle_comment.whether_doctor, - sick_circle_comment_count.comment_id, + sick_circle_comment_count.comment_id as commentUserId, sick_circle_comment_count.oppose_num, sick_circle_comment_count.support_num, - sick_circle_comment_view.opinion + sick_circle_comment_view.opinion , + `user`.head_pic FROM sick_circle_comment - LEFT JOIN sick_circle_comment_count ON sick_circle_comment.patient_user_id = sick_circle_comment_count.comment_id LEFT JOIN sick_circle_comment_view on sick_circle_comment.patient_user_id=sick_circle_comment_view.opinion where - sick_circle_comment.sick_circle_id=#{sickCircleId} + LEFT JOIN sick_circle_comment_count ON sick_circle_comment.patient_user_id = sick_circle_comment_count.comment_id + LEFT JOIN sick_circle_comment_view ON sick_circle_comment.patient_user_id = sick_circle_comment_view.comment_id + LEFT JOIN `user` on sick_circle_comment_view.user_id=`user`.id + WHERE + sick_circle_comment.sick_circle_id =#{sickCircleId} + +