更改

grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/reponse/DiseaseMedicineResponse.java

@@ -0,0 +1,23 @@
+package com.grail.interrogation.domain.reponse;
+
+import com.grail.interrogation.domain.DiseaseDetatil;
+import com.grail.interrogation.domain.MedicineDetail;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 病症和药品
+ * @author: SIKADI
+ * @date: 2023/10/31 18:39
+ **/
+@Data
+public class DiseaseMedicineResponse {
+
+    /**
+     * 病症集合
+     */
+    private List<DiseaseDetatil> diseaseDetatils;
+
+    private List<MedicineDetail> medicineDetailList;
+}

grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/request/HomepageRequest.java

@@ -12,4 +12,7 @@ public class HomepageRequest {
 
     private Integer homepageId=3;
 
+
+    private String homepageName;
+
 }

grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/HomepageController.java

@@ -7,6 +7,7 @@ import com.grail.common.core.utils.QiNiuUpload;
 import com.grail.interrogation.domain.DiseaseDetatil;
 import com.grail.interrogation.domain.Homepage;
 import com.grail.interrogation.domain.ListHomepage;
+import com.grail.interrogation.domain.reponse.DiseaseMedicineResponse;
 import com.grail.interrogation.domain.request.HomepageRequest;
 import com.grail.interrogation.service.HomepageServer;
 import lombok.extern.log4j.Log4j2;
@@ -53,6 +54,13 @@ public class HomepageController {
 
     }
 
+    /**
+     *  再次点击科室，是否为正确的科室
+     * @author: ZhuoXin
+     * @date: 2023/10/31 13:30
+     * @param: [homepageRequest]
+     * @return: com.grail.common.core.domain.R
+     **/
     @PostMapping("/homepageMedicineDisease")
     public R homepageMedicineDisease(@RequestBody HomepageRequest homepageRequest){
         log.info("功能:查看病症详情和药品详情,URI:{},方法:{},参数{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(homepageRequest));
@@ -66,4 +74,24 @@ public class HomepageController {
 
 
 
+    /**
+     *  查询病症或科室的列表信息
+     * @author: ZhuoXin
+     * @date: 2023/10/31 18:48
+     * @param: [homepageRequest]
+     * @return: com.grail.common.core.domain.R
+     **/
+    @PostMapping("/medicineDiseaseList")
+    public R medicineDiseaseList(@RequestBody HomepageRequest homepageRequest){
+        log.info("功能:查询病症和科室的列表详情,URI:{},方法:{},参数:{}",
+                request.getRequestURI(),request.getMethod(),JSON.toJSONString(homepageRequest));
+        DiseaseMedicineResponse list = homepageServer.medicineDiseaseList(homepageRequest);
+        log.info("功能:查询病症和科室的列表详情,URI:{},方法:{},需要:{}",
+                request.getRequestURI(),request.getMethod(),JSON.toJSONString(list));
+        return  R.ok("查询成功");
+
+    }
+
+
+
 }

grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/DiseaseDetatilMapper.java

@@ -18,4 +18,6 @@ public interface DiseaseDetatilMapper {
 
     List<DiseaseDetatil> List(@Param("id") Integer id);
 
+    List<DiseaseDetatil> diseaseList(@Param("homepageName") String homepageName);
+
 }

grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java

@@ -1,5 +1,6 @@
 package com.grail.interrogation.mapper;
 
+import com.grail.interrogation.domain.DiseaseDetatil;
 import com.grail.interrogation.domain.MedicineDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,7 @@ public interface MedicineDetailMapper {
 
     List<MedicineDetail> List(@Param("id") Integer id);
 
+    List<MedicineDetail> medicineList(@Param("homepageName") String homepageName);
+
+
 }

grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/HomepageServer.java

@@ -2,6 +2,7 @@ package com.grail.interrogation.service;
 
 import com.grail.interrogation.domain.Homepage;
 import com.grail.interrogation.domain.ListHomepage;
+import com.grail.interrogation.domain.reponse.DiseaseMedicineResponse;
 import com.grail.interrogation.domain.request.HomepageRequest;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface HomepageServer {
     List<Homepage> homepageList();
 
     Homepage homepageMedicineDiseaseList(HomepageRequest homepageRequest);
+
+    DiseaseMedicineResponse medicineDiseaseList(HomepageRequest homepageRequest);
 }

grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java

@@ -5,6 +5,7 @@ import com.grail.interrogation.domain.DiseaseDetatil;
 import com.grail.interrogation.domain.Homepage;
 import com.grail.interrogation.domain.ListHomepage;
 import com.grail.interrogation.domain.MedicineDetail;
+import com.grail.interrogation.domain.reponse.DiseaseMedicineResponse;
 import com.grail.interrogation.domain.request.HomepageRequest;
 import com.grail.interrogation.mapper.DiseaseDetatilMapper;
 import com.grail.interrogation.mapper.HomepageMapper;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.grail.common.redis.service.RedisService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -61,6 +63,13 @@ public class HomepageServerImpl implements HomepageServer {
         return homepages;
     }
 
+    /**
+     * 查询对应的列表
+     * @author: ZhuoXin
+     * @date: 2023/10/31 18:49
+     * @param: [homepageRequest]
+     * @return: com.grail.interrogation.domain.Homepage
+     **/
     @Override
     public Homepage homepageMedicineDiseaseList(HomepageRequest homepageRequest) {
         Homepage homepage =  homepageMapper.homepageId(homepageRequest);
@@ -75,4 +84,22 @@ public class HomepageServerImpl implements HomepageServer {
 
         return homepage;
     }
+
+
+    /**
+     * 查询处有利用的价值
+     * @author: ZhuoXin
+     * @date: 2023/10/31 18:50
+     * @param: [homepageRequest]
+     * @return: com.grail.interrogation.domain.reponse.DiseaseMedicineResponse
+     **/
+    @Override
+    public DiseaseMedicineResponse medicineDiseaseList(HomepageRequest homepageRequest) {
+        DiseaseMedicineResponse  list = new DiseaseMedicineResponse();
+        List<MedicineDetail>   medicineDetailList = medicineDetailMapper.medicineList(homepageRequest.getHomepageName());
+        List<DiseaseDetatil> diseaseDetatils = diseaseDetatilMapper.diseaseList(homepageRequest.getHomepageName());
+        list.setMedicineDetailList(medicineDetailList);
+        list.setDiseaseDetatils(diseaseDetatils);
+        return list;
+    }
 }

grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml

@@ -23,8 +23,7 @@
      values (#{diseaseName},#{pathology},#{symptom},#{attention},#{westernTreatment},#{createId},now(),#{image},#{status});
     </insert>
 
-    <select id="List" resultMap="map">
+    <sql id="sql">
-        SELECT
             disease_id,
             disease_name,
             pathology,
@@ -33,6 +32,11 @@
             western_treatment,
             image,
             `status`
+    </sql>
+
+    <select id="List" resultMap="map">
+        SELECT
+           <include refid="sql"/>
         FROM
             tb_disease_detatil a
                 LEFT JOIN homepage_middle_disease b ON a.disease_id = b.middle_disease
@@ -40,4 +44,14 @@
             a.`status` = 3
           AND b.middle_homepage = #{id}
     </select>
+    <select id="diseaseList" resultMap="map">
+        SELECT
+          <include refid="sql"/>
+        FROM
+            tb_disease_detatil a
+        LEFT JOIN  homepage_middle_disease b ON  a.disease_id = b.middle_disease
+        WHERE
+            a.`status` = 3
+        AND b.disease_name = #{homepageName}
+    </select>
 </mapper>

grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml

@@ -40,9 +40,8 @@
         values (#{ingredient},#{medicineName},#{medicineAvoid},#{usageAndDosage},#{characterTwo},#{packageSpecification},#{adverseReaction},#{createId},now(),#{status},#{image});
     </insert>
 
-    <select id="List" resultMap="map">
+    <sql id="sql">
-        SELECT
+        medicine_id,
-            medicine_id,
             medicine_name,
             ingredient,
             medicine_avoid,
@@ -53,6 +52,11 @@
             adverse_reaction,
             `status`,
             image
+    </sql>
+
+    <select id="List" resultMap="map">
+        SELECT
+             <include refid="sql"/>
         FROM
             tb_medicine_detail a
                 LEFT JOIN homepage_middle_medicine b ON a.medicine_id = b.middle_medicine
@@ -61,4 +65,14 @@
         AND
             a.`status` = 3
     </select>
+    <select id="medicineList" resultMap="map">
+        SELECT
+            <include refid="sql"/>
+        FROM
+            tb_medicine_datail a
+                LEFT JOIN homepage_middle_medicicne b ON a.medicine_id = b.middle_medcicne
+        WHERE
+            <if test=""></if>
+    </select>
+
 </mapper>