From 23d81a5719657321d6d90361388b3a4fc976bb53 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 11 Dec 2023 09:13:47 +0800 Subject: [PATCH] =?UTF-8?q?web:=20=E6=9F=A5=E8=AF=A2=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TreatmentPlanController.java | 9 +++++++++ .../service/TreatmentPlanService.java | 2 ++ .../service/impl/TreatmentPlanServiceImpl.java | 17 ++++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java index f51fbed9..8479ac81 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java @@ -3,6 +3,7 @@ package com.supervision.controller; import com.supervision.model.ConfigDrug; import com.supervision.model.TreatmentPlanRecord; import com.supervision.service.TreatmentPlanService; +import com.supervision.vo.manage.TreatmentPlanTreeNode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -70,5 +71,13 @@ public class TreatmentPlanController { return treatmentPlanService.getDrugList(); } + @ApiOperation("查询处置计划树") + @GetMapping("/queryTree") + public List queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod) { + + return treatmentPlanService.queryTree(disposalMethod); + + } + } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java index 361937d4..1fcd1468 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java @@ -2,6 +2,7 @@ package com.supervision.service; import com.supervision.model.ConfigDrug; import com.supervision.model.TreatmentPlanRecord; +import com.supervision.vo.manage.TreatmentPlanTreeNode; import java.util.List; @@ -18,4 +19,5 @@ public interface TreatmentPlanService { List getDrugList(); + List queryTree(Integer disposalMethod); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java index 19ef203e..55960931 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java @@ -4,13 +4,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; +import com.supervision.controller.TreatmentPlanController; import com.supervision.model.ConfigDrug; import com.supervision.model.Process; import com.supervision.model.TreatmentPlanRecord; -import com.supervision.service.ConfigDrugService; -import com.supervision.service.ProcessService; -import com.supervision.service.TreatmentPlanRecordService; -import com.supervision.service.TreatmentPlanService; +import com.supervision.service.*; +import com.supervision.vo.manage.TreatmentPlanTreeNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -24,12 +23,14 @@ import java.util.List; @RequiredArgsConstructor public class TreatmentPlanServiceImpl implements TreatmentPlanService { - private final TreatmentPlanRecordService treatmentPlanRecordService; private final ProcessService processService; private final ConfigDrugService configDrugService; + + private final ConfigTreatmentPlanService configTreatmentPlanService; + @Override public boolean saveTreatmentPlanRecord(TreatmentPlanRecord treatmentPlanRecord) { @@ -87,6 +88,12 @@ public class TreatmentPlanServiceImpl implements TreatmentPlanService { return configDrugService.list(); } + @Override + public List queryTree(Integer disposalMethod) { + + return configTreatmentPlanService.queryTree(disposalMethod); + } + private void assertSaveTreatmentPlanRecord(TreatmentPlanRecord record){ Assert.notEmpty(record.getProcessId(),"流程id不能为空"); Assert.notNull(record.getDisposalMethod(),"处置方式不能为为空");