diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java index ffb7c9bb..a6537264 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java @@ -6,6 +6,7 @@ import com.supervision.model.ConfigTreatmentPlan; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import lombok.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -24,23 +25,16 @@ public class TreatmentPlanManageController { @ApiOperation("查询处置计划树") @GetMapping("/queryTree") - public List queryTree(@RequestParam("处置方式") Integer disposalMethod) { + public List queryTree(@RequestParam(name = "disposalMethod",required = false) Integer disposalMethod) { return configTreatmentPlanManageService.queryTree(disposalMethod); } - @ApiOperation("查询疾病处置计划列表") - @GetMapping("/queryList") - public List queryList(@RequestParam("处置方式") Integer disposalMethod) { - - return configTreatmentPlanManageService.queryList(disposalMethod); - - } @ApiOperation("根据id查询处置计划详情") @GetMapping("/findById") - public TreeNode findById(@RequestParam("处置方式") String id) { + public ConfigTreatmentPlan findById(@RequestParam("处置方式") String id) { return configTreatmentPlanManageService.findById(id); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java index d18d1b71..819660f3 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java @@ -55,4 +55,5 @@ public class DiseaseTreatmentPlanManageController { } + } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java index 6045a33a..da706457 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java @@ -9,7 +9,5 @@ public interface ConfigTreatmentPlanManageService { List queryTree(Integer disposalMethod); - List queryList(Integer disposalMethod); - - TreeNode findById(String id); + ConfigTreatmentPlan findById(String id); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java index 0be52284..0a1d9c8d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java @@ -1,5 +1,6 @@ package com.supervision.manage.service; +import com.supervision.model.ConfigTreatmentPlan; import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java index 93b76796..d9321685 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java @@ -1,6 +1,7 @@ package com.supervision.manage.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.model.ConfigTreatmentPlan; @@ -72,14 +73,13 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan return root.getChild(); } - @Override - public List queryList(Integer disposalMethod) { - return null; - } @Override - public TreeNode findById(String id) { - return null; + public ConfigTreatmentPlan findById(String id) { + + Assert.notEmpty(id,"id 不允许为空"); + return configTreatmentPlanService.getById(id); + } }