diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java deleted file mode 100644 index 59cd42c..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java +++ /dev/null @@ -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> bannersShow(){ - List banners = bannersService.bannersShow(); - return HealthR.ok(banners); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java deleted file mode 100644 index 68efab3..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java +++ /dev/null @@ -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> findDepartment(){ - List list=departmentService.findDepartment(); - return HealthR.ok(list); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java deleted file mode 100644 index 8b16640..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java +++ /dev/null @@ -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> findDiseaseCategory(@RequestParam Integer departmentId){ - List list=diseaseCategoryService.findDiseaseCategory(departmentId); - return HealthR.ok(list); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java deleted file mode 100644 index 1b249ac..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ /dev/null @@ -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> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ - return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); - } - - @GetMapping("/findDrugsCategoryList") - public HealthR> findDrugsCategoryList(){ - return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList()); - } - @GetMapping("/findDrugsKnowledgeList") - public HealthR> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, - @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "5") Integer count){ - - startPage(page,count); - List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); - return HealthR.ok(list); - } - - - - - - - -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java index 78e2c84..bd8a3b5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java +++ b/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> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ + return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); + } + + @GetMapping("/findDrugsCategoryList") + public HealthR> findDrugsCategoryList(){ + return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList()); + } + @GetMapping("/findDrugsKnowledgeList") + public HealthR> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count){ + + startPage(page,count); + List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); + return HealthR.ok(list); + } + + + @GetMapping("/findDiseaseCategory") + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return HealthR.ok(list); + } @GetMapping("/findDepartment") public HealthR> findDepartment(){ diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java index a4f50d9..68e80b4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java +++ b/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> bannersShow(){ + List banners = bannersService.bannersShow(); + return HealthR.ok(banners); + } + @GetMapping("/findJobTitleList") public HealthR> findJobTitleList() { List doctorJobTitleEntities=healthJobTitleService.findJobTitleList(); diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java index 83f772f..7260aeb 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java +++ b/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;