From 5e55882896053e7e7df1778e4ee897a0c0d382eb Mon Sep 17 00:00:00 2001
From: sikadi <13315935+sikadi_love@user.noreply.gitee.com>
Date: Sun, 29 Oct 2023 19:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/grail/interrogation/domain/DiseaseDetatil.java  | 5 +++++
 .../java/com/grail/interrogation/domain/MedicineDetail.java  | 5 +++++
 .../grail/interrogation/service/impl/HomepageServerImpl.java | 4 ++--
 .../resources/mapper/interrogation/DiseaseDetatilMapper.xml  | 3 ++-
 .../resources/mapper/interrogation/MedicineDetailMapper.xml  | 5 ++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

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 249d405..92c2cb5 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
@@ -23,6 +23,11 @@ public class DiseaseDetatil {
      **/
     private  Integer diseaseId;
 
+    /**
+     * 标题
+     **/
+    private String medicineName;
+
     /**
      * 病理
      **/
diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java
index 49e8d78..3e3fcfe 100644
--- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java
+++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java
@@ -23,6 +23,11 @@ public class MedicineDetail {
      **/
     private Integer medicineId;
 
+    /**
+     * 标题
+     **/
+    private String medicineName;
+
     /**
      * 药品成分
      **/
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 a16980c..5882d1b 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<MedicineDetail> medicineDetailList = medicineDetailMapper.medicineDetailList(listHomepages.getId());
+            List<MedicineDetail> medicineDetailList = medicineDetailMapper.medicineDetailList(homepageRequest.getMedicineId());
             // 赋值到药品列表里
             listHomepages.setMedicineDetailList(medicineDetailList);
         }else {
-            List<DiseaseDetatil> diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(listHomepages.getId());
+            List<DiseaseDetatil> diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(homepageRequest.getDiseaseDetatilId());
             // 赋值到病症列表里
             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 e02732d..0ecc5f4 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,6 +7,7 @@
  <resultMap id="map" type="com.grail.interrogation.domain.DiseaseDetatil">
   <id property="diseaseDetailId" column="disease_detail_id"></id>
   <result property="diseaseId" column="disease_id"></result>
+  <result property="medicineName" column="medicine_name"></result>
   <result property="pathology" column="pathology"></result>
   <result property="symptom" column="symptom"></result>
   <result property="attention" column="attention"></result>
@@ -26,7 +27,7 @@
 
     <select id="diseaseDetatilList" resultType="com.grail.interrogation.domain.DiseaseDetatil">
   select
-      disease_detail_id,disease_id,pathology,symptom,attention,western_treatment,create_id,create_date,update_id,update_date,image,status
+      disease_detail_id,disease_id,medicine_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}
  </select>
 </mapper>
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 ab3df15..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
@@ -7,6 +7,7 @@
         <id property="medicineId" column="medicine_id"></id>
         <result property="medicineDetailId" column="medicine_detail_id"></result>
         <result property="ingredient" column="ingredient"></result>
+        <result property="medicineName" column="medicine_name"></result>
         <result property="medicineAvoid" column="medicine_avoid"></result>
         <result property="majorFunction" column="major_function"></result>
         <result property="usageAndDosage" column="usage_and_dosage"></result>
@@ -26,6 +27,7 @@
         insert into tb_medicine_detail (
                                         medicine_detail_id,
                                         ingredient,
+                                        medicine_name,
                                         medicine_avoid,
                                         major_function,
                                         usage_and_dosage,
@@ -37,7 +39,7 @@
                                         status,
                                         image
                                         )
-        values (#{medicineDetailId},#{ingredient},#{medicineAvoid},#{usageAndDosage},#{characterTwo},#{packageSpecification},#{adverseReaction},#{createId},now(),#{status},#{image});
+        values (#{medicineDetailId},#{ingredient},#{medicineName},#{medicineAvoid},#{usageAndDosage},#{characterTwo},#{packageSpecification},#{adverseReaction},#{createId},now(),#{status},#{image});
     </insert>
 
 
@@ -45,6 +47,7 @@
     select
         medicine_detail_id,
         medicine_id,
+        medicine_name,
         ingredient,
         medicine_avoid,
         major_function,