合并请求路径(患者)

# Conflicts:
#	doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
#	doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java

doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java

@@ -1,31 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.Banners;
-import doctor.service.BannersService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 15:54
- */
-@RestController
-@RequestMapping("/share/v1")
-
-public class BannersController {
-    @Autowired
-    private BannersService bannersService;
-    @GetMapping("/bannersShow")
-    public HealthR<List<Banners>> bannersShow(){
-        List<Banners> banners = bannersService.bannersShow();
-        return HealthR.ok(banners);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java

@@ -1,30 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.Department;
-import doctor.service.DepartmentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 16:49
- */
-@RestController
-@RequestMapping("/share/knowledgeBase/v1")
-public class DepartmentController {
-    @Autowired
-    private DepartmentService departmentService;
-    @GetMapping("/findDepartment")
-    public HealthR<List<Department>> findDepartment(){
-        List<Department> list=departmentService.findDepartment();
-        return HealthR.ok(list);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java

@@ -1,33 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.DiseaseCategory;
-import doctor.service.DiseaseCategoryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.xml.transform.Result;
-import java.util.List;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 17:16
- */
-@RestController
-@RequestMapping("/share/knowledgeBase/v1")
-public class DiseaseCategoryController {
-    @Autowired
-    private DiseaseCategoryService diseaseCategoryService;
-
-    @GetMapping("/findDiseaseCategory")
-    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
-        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
-        return HealthR.ok(list);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java

@@ -1,55 +0,0 @@
-package doctor.controller;
-
-
-import doctor.common.core.domain.HealthR;
-import doctor.domain.entity.DiseaseKnowledge;
-import doctor.domain.entity.DrugsCategory;
-import doctor.service.DiseaseKnowledgeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import static doctor.common.core.utils.PageUtils.startPage;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 20:56
- */
-@RestController
-@RequestMapping("/share/knowledgeBase/v1")
-public class DiseaseKnowledgeController {
-    @Autowired
-    private DiseaseKnowledgeService diseaseKnowledgeService;
-    //罕见病症详情
-    @GetMapping("/findDiseaseKnowledge")
-    public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){
-        return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId));
-    }
-
-    @GetMapping("/findDrugsCategoryList")
-    public HealthR<List<DrugsCategory>> findDrugsCategoryList(){
-        return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList());
-    }
-    @GetMapping("/findDrugsKnowledgeList")
-    public HealthR<List<DrugsCategory>> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId,
-                                                         @RequestParam(value = "page",defaultValue = "1") Integer page,
-                                                         @RequestParam(value = "count",defaultValue = "5") Integer count){
-
-        startPage(page,count);
-        List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
-        return HealthR.ok(list);
-    }
-
-
-
-
-
-
-
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java

@@ -1,21 +1,58 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
-import doctor.domain.entity.DepartmentEntity;
+import doctor.domain.entity.*;
+import doctor.service.DepartmentService;
+import doctor.service.DiseaseCategoryService;
+import doctor.service.DiseaseKnowledgeService;
 import doctor.service.HealthDepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+import static com.github.pagehelper.page.PageMethod.startPage;
+
 @RestController
 @RequestMapping("/knowledgeBase/v1")
 public class HealthDepartmentController {
 
     @Autowired
     private HealthDepartmentService healthV1Service;
+    @Autowired
+    private DiseaseCategoryService diseaseCategoryService;
+
+    @Autowired
+    private DiseaseKnowledgeService diseaseKnowledgeService;
+    //罕见病症详情
+    @GetMapping("/findDiseaseKnowledge")
+    public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){
+        return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId));
+    }
+
+    @GetMapping("/findDrugsCategoryList")
+    public HealthR<List<DrugsCategory>> findDrugsCategoryList(){
+        return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList());
+    }
+    @GetMapping("/findDrugsKnowledgeList")
+    public HealthR<List<DrugsCategory>> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId,
+                                                               @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                               @RequestParam(value = "count",defaultValue = "5") Integer count){
+
+        startPage(page,count);
+        List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
+        return HealthR.ok(list);
+    }
+
+
+    @GetMapping("/findDiseaseCategory")
+    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
+        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
+        return HealthR.ok(list);
+    }
 
     @GetMapping("/findDepartment")
     public HealthR<List<DepartmentEntity>> findDepartment(){

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java

@@ -2,7 +2,9 @@ package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
 import doctor.domain.dto.ApplyJoinDto;
+import doctor.domain.entity.Banners;
 import doctor.domain.entity.DoctorJobTitleEntity;
+import doctor.service.BannersService;
 import doctor.service.HealthJobTitleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -15,6 +17,14 @@ public class HealthJobTitleController {
     @Autowired
     private HealthJobTitleService healthJobTitleService;
 
+    @Autowired
+    private BannersService bannersService;
+    @GetMapping("/bannersShow")
+    public HealthR<List<Banners>> bannersShow(){
+        List<Banners> banners = bannersService.bannersShow();
+        return HealthR.ok(banners);
+    }
+
     @GetMapping("/findJobTitleList")
     public HealthR<List<DoctorJobTitleEntity>> findJobTitleList() {
         List<DoctorJobTitleEntity> doctorJobTitleEntities=healthJobTitleService.findJobTitleList();

doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java

@@ -21,7 +21,7 @@ import static com.github.pagehelper.page.PageMethod.startPage;
  * @CreateTime: 2024/1/11 16:19
  */
 @RestController
-@RequestMapping("/share/information/v1")
+@RequestMapping("/information/v1")
 public class InformationController {
     @Autowired
     private InformationService informationService;

doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java

@@ -1,9 +1,6 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.UserWalletEntity;
 import doctor.domain.vo.UserVideoBuyVo;
 import doctor.domain.vo.UserVideoCollectionVo;
@@ -30,7 +27,7 @@ public class UserVideoController {
 
     //用户视频收藏列表
     @GetMapping("/findVideoCollectionList")
-    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page,@RequestParam Integer count){
+    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count){
         startPage(page,count);
       List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList();
         return HealthR.ok(userVideoCollectionVos);