diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java index b44ab41b..67767136 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java @@ -1,5 +1,6 @@ package com.supervision.manage.controller.config; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.vo.manage.TreatmentPlanTreeNode; import com.supervision.model.ConfigTreatmentPlan; @@ -40,6 +41,17 @@ public class TreatmentPlanManageController { } + @ApiOperation("分页查询处置计划列表") + @GetMapping("/queryPageList") + public IPage queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, + @RequestParam(defaultValue = "10")Integer pageSize, + @ApiParam("处置方式(0门诊 1住院)") + @RequestParam(required = false) String disposalMethod) { + + return configTreatmentPlanManageService.queryPageList(pageNum, pageSize, disposalMethod); + + } + } 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 416d7756..e5b55496 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 @@ -1,5 +1,6 @@ package com.supervision.manage.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.model.ConfigTreatmentPlan; import com.supervision.vo.manage.TreatmentPlanTreeNode; @@ -10,4 +11,6 @@ public interface ConfigTreatmentPlanManageService { List queryTree(Integer disposalMethod); ConfigTreatmentPlan findById(String id); + + IPage queryPageList(Integer pageNum, Integer pageSize, String disposalMethod); } 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 ca000a74..4efbf79e 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,8 +1,10 @@ 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.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.model.ConfigTreatmentPlan; import com.supervision.service.ConfigTreatmentPlanService; @@ -34,4 +36,12 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan } + @Override + public IPage queryPageList(Integer pageNum, Integer pageSize, String disposalMethod) { + LambdaQueryChainWrapper wrapper = configTreatmentPlanService.lambdaQuery() + .eq(StrUtil.isNotBlank(disposalMethod), ConfigTreatmentPlan::getDisposalMethod, disposalMethod); + + return configTreatmentPlanService.page(new Page<>(pageNum, pageSize), wrapper); + } + } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java index ff32e365..07961719 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java @@ -40,7 +40,9 @@ public class ConfigTreatmentPlan implements Serializable { @ApiModelProperty("一级措施") private String firstMeasures; - + /** + * 目前只有药物才会存在二级措施 + */ @ApiModelProperty("二级措施") private String secondMeasures;