From 996a275bbc27f6f69d576710d83e3c85d1f04661 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 10 Jan 2024 09:09:38 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=20=E5=88=A0=E9=99=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=80=E7=BA=A7=E5=A4=84=E7=BD=AE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/TreatmentPlanManageController.java | 9 --------- .../ConfigTreatmentPlanManageService.java | 2 -- .../ConfigTreatmentPlanManageServiceImpl.java | 20 ------------------- 3 files changed, 31 deletions(-) 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 b31d886c..79374948 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 @@ -30,15 +30,6 @@ public class TreatmentPlanManageController { } - @ApiOperation("查询一级处置计划") - @GetMapping("/queryFirstMeasures") - public List queryFirstMeasures(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod, - @ApiParam("处置计划id")@RequestParam(required = false) String disposalPlanId) { - - return configTreatmentPlanManageService.queryFirstMeasures(disposalMethod,disposalPlanId); - - } - @ApiOperation("根据id查询处置计划详情") @GetMapping("/findById") 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 c2a64d6b..627d212e 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 @@ -19,6 +19,4 @@ public interface ConfigTreatmentPlanManageService { boolean deleteTreatmentPlan(String id); boolean updateTreatmentPlan(ConfigTreatmentPlan configDrug); - - List queryFirstMeasures(Integer disposalMethod,String disposalPlanId); } 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 2ec55d99..4716944f 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 @@ -93,26 +93,6 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan return configTreatmentPlanService.updateById(configDrug); } - @Override - public List queryFirstMeasures(Integer disposalMethod,String disposalPlanId) { - List list = configTreatmentPlanService.lambdaQuery() - .eq(Objects.nonNull(disposalMethod), ConfigTreatmentPlan::getDisposalMethod, disposalMethod) - .eq(StrUtil.isNotEmpty(disposalPlanId), ConfigTreatmentPlan::getDisposalPlanId, disposalPlanId) - .list(); - if (CollectionUtil.isEmpty(list)){ - return list; - } - - return list.stream().filter(distinctPredicate(item->StrUtil.join(",", - item.getDisposalMethod(),item.getDisposalPlanId(),item.getFirstMeasuresId()))) - .collect(Collectors.toList()); - } - - public static Predicate distinctPredicate(Function function){ - ConcurrentHashMap map = new ConcurrentHashMap<>(); - return (t)-> null == map.putIfAbsent(function.apply(t),true); - - } public void saveAssert(ConfigTreatmentPlan configDrug){ Assert.isTrue(StrUtil.isEmpty(configDrug.getId()),"id 不为空");