cbx
/
Medical_Treatment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/newMaster' into newMaster 

# Conflicts:
#	doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java
#	doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java
#	doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml
newMaster
liyongbin 2024-01-21 11:50:41 +08:00
parent 3b4600db02 b7c3a1f09e
commit d507b1b95f
5 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java
View File

@ -37,7 +37,6 @@ public class DiseaseKnowledgeController {
return HealthR.ok(departments); return HealthR.ok(departments);
} }
//罕见病症详情 //罕见病症详情
@GetMapping("/findDiseaseKnowledge") @GetMapping("/findDiseaseKnowledge")
public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){

1
doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java
View File

@ -37,6 +37,5 @@ public interface PatientMapper {
List<SickCircleEntity> searchSickCircle(@Param("keyWord") String keyWord); List<SickCircleEntity> searchSickCircle(@Param("keyWord") String keyWord);
List<SickCircleEntity> findPatientSickCircleList(@Param("patientUserId") Integer patientUserId);
} }

8
doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java
View File

@ -14,21 +14,13 @@ import java.util.List;
*/ */
public interface PatientService { public interface PatientService {
SickCircleEntity findSickCircleInfo(Integer id); SickCircleEntity findSickCircleInfo(Integer id);
Result<List<SymptomEntity>> symptomList(); Result<List<SymptomEntity>> symptomList();
HealthR<List<SickCircleEntity>> sickCircleList(Integer departmentId, Integer page, Integer count); HealthR<List<SickCircleEntity>> sickCircleList(Integer departmentId, Integer page, Integer count);

9
doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java
View File

@ -63,15 +63,6 @@ public class PatientServiceImpl extends BaseController implements PatientService
return HealthR.ok(list); return HealthR.ok(list);
} }
@Override
public HealthR<List<SickCircleEntity>> findPatientSickCircleList(Integer patientUserId, Integer page, Integer count) {
startPage(page,count);
List<SickCircleEntity> sickCircleEntity = patientMapper.findPatientSickCircleList(patientUserId);
return HealthR.ok(sickCircleEntity);
}
@Override @Override
public SickCircleEntity findSickCircleInfo(Integer id) { public SickCircleEntity findSickCircleInfo(Integer id) {

18
doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml
View File

@ -35,18 +35,14 @@
sick_circle_comment.create_time, sick_circle_comment.create_time,
sick_circle_comment.patient_user_id, sick_circle_comment.patient_user_id,
sick_circle_comment.whether_doctor, sick_circle_comment.whether_doctor,
sick_circle_comment_count.comment_id AS commentUserId, sick_circle_comment_count.comment_id,
sick_circle_comment_count.oppose_num, sick_circle_comment_count.oppose_num,
sick_circle_comment_count.support_num, sick_circle_comment_count.support_num,
sick_circle_comment_view.opinion, sick_circle_comment_view.opinion
`user`.head_pic
FROM FROM
sick_circle_comment 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_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
LEFT JOIN sick_circle_comment_view ON sick_circle_comment.patient_user_id = sick_circle_comment_view.comment_id sick_circle_comment.sick_circle_id=#{sickCircleId}
LEFT JOIN `user` on sick_circle_comment.patient_user_id=`user`.id
WHERE
sick_circle_comment.sick_circle_id=#{sickCircleId}
</select> </select>
<select id="searchSickCircle" resultType="doctor.domain.entity.SickCircleEntity"> <select id="searchSickCircle" resultType="doctor.domain.entity.SickCircleEntity">
@ -55,10 +51,4 @@
</select> </select>
<select id="findPatientSickCircleList" resultType="doctor.domain.entity.SickCircleEntity"
parameterType="java.lang.Integer">
select sick_circle_id , `user_id`, `title`, `department_id`, `adopt_comment_id`, `disease`, `detail`, `treatment_hospital`, `treatment_start_time`, `treatment_end_time`, `treatment_process`, `picture`, `release_time`, `adopt_time`, `amount`, `create_time`, `collection_num`, `comment_num`
from sick_circle where user_id=#{patientUserId}
</select>
</mapper> </mapper>