From d11059654db26f2dff27644418f2d3d2c484abfd Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 30 May 2024 11:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=B4=E9=97=A8=E5=8C=BB=E8=BF=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=8E=B7=E5=8F=96=E8=AF=BE=E7=A8=8B=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8D=95=E8=8A=82=E7=82=B9=E7=9A=84=E5=AD=90?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical/controller/HomeController.java    |  7 +++++++
 .../medical/service/CourseMedicalService.java |  3 +++
 .../impl/CourseMedicalServiceImpl.java        | 19 +++++++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/peanut/modules/medical/controller/HomeController.java b/src/main/java/com/peanut/modules/medical/controller/HomeController.java
index a734538b..ad4bb4e6 100644
--- a/src/main/java/com/peanut/modules/medical/controller/HomeController.java
+++ b/src/main/java/com/peanut/modules/medical/controller/HomeController.java
@@ -43,6 +43,13 @@ public class HomeController {
         return R.ok().put("labels",labelsTree);
     }
 
+    //获取医学标签树
+    @RequestMapping("/getChildCourseMedicalTree")
+    public R getChildCourseMedicalTree(@RequestBody ParamTo param){
+        List<CourseMedicine> labelsTree = medicalService.getChildCourseMedicalTree(param);
+        return R.ok().put("labels",labelsTree);
+    }
+
     //获取医学标签下的课程列表
     @RequestMapping("/getMedicalCourseList")
     public R getMedicalCourseList(@RequestBody ParamTo param){
diff --git a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java
index e8c4fd96..3ccf7360 100644
--- a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java
+++ b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java
@@ -2,6 +2,7 @@ package com.peanut.modules.medical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.modules.common.entity.CourseMedicine;
+import com.peanut.modules.common.to.ParamTo;
 
 import java.util.List;
 
@@ -10,4 +11,6 @@ public interface CourseMedicalService extends IService<CourseMedicine> {
     List<CourseMedicine> getMedicalLabels(Integer id);
 
     List<CourseMedicine> getCourseMedicalTree();
+
+    List<CourseMedicine> getChildCourseMedicalTree(ParamTo param);
 }
diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java
index 59f6c440..8deffad0 100644
--- a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java
+++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.modules.common.dao.CourseMedicineDao;
 import com.peanut.modules.common.entity.CourseMedicine;
+import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.medical.service.CourseMedicalService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -27,8 +28,22 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
     @Override
     public List<CourseMedicine> getCourseMedicalTree() {
         List<CourseMedicine> medicines = this.list(new QueryWrapper<>());
-        List<CourseMedicine> medicinesTree = medicines.stream().filter((courseMarketEntity) ->
-                courseMarketEntity.getPid() == 0
+        List<CourseMedicine> medicinesTree = medicines.stream().filter((courseMedicine) ->
+                courseMedicine.getPid() == 0
+        ).map((medicine)->{
+            medicine.setChildren(getMedicineChildrens(medicine,medicines));
+            return medicine;
+        }).sorted((sort1,sort2)->{
+            return (sort1.getSort() == null? 0 : sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort());
+        }).collect(Collectors.toList());
+        return medicinesTree;
+    }
+
+    @Override
+    public List<CourseMedicine> getChildCourseMedicalTree(ParamTo param) {
+        List<CourseMedicine> medicines = this.list(new QueryWrapper<>());
+        List<CourseMedicine> medicinesTree = medicines.stream().filter((courseMedicine) ->
+                courseMedicine.getPid() == param.getId()
         ).map((medicine)->{
             medicine.setChildren(getMedicineChildrens(medicine,medicines));
             return medicine;