diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java index 92c2cb5..641e7cd 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java @@ -26,7 +26,7 @@ public class DiseaseDetatil { /** * 标题 **/ - private String medicineName; + private String diseaseName; /** * 病理 diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java index 5882d1b..a16980c 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java @@ -97,11 +97,11 @@ public class HomepageServerImpl implements HomepageServer { if(1== listHomepages.getPid()){ // 药品的列表 - List medicineDetailList = medicineDetailMapper.medicineDetailList(homepageRequest.getMedicineId()); + List medicineDetailList = medicineDetailMapper.medicineDetailList(listHomepages.getId()); // 赋值到药品列表里 listHomepages.setMedicineDetailList(medicineDetailList); }else { - List diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(homepageRequest.getDiseaseDetatilId()); + List diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(listHomepages.getId()); // 赋值到病症列表里 listHomepages.setDiseaseDetatils(diseaseDetatils); } diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml index 67abea2..350f9f5 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml @@ -7,7 +7,7 @@ - + @@ -20,9 +20,9 @@ - select - disease_detail_id,disease_id,medicine_name,pathology,symptom,attention,western_treatment,create_id,create_date,update_id,update_date,image,status + disease_detail_id,disease_id,disease_name,pathology,symptom,attention,western_treatment,create_id,create_date,update_id,update_date,image,status from tb_disease_detatil where status = 3 and disease_detail_id = #{id} diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml index 459fbcd..302c79b 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml @@ -43,7 +43,7 @@ - select medicine_detail_id, medicine_id,