From 3f141cd14ea220cd036e7811f4ee21829bf0aa87 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 10 Jan 2024 09:11:43 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=20=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigTreatmentPlanManageServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) 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 4716944f..c6a99e8c 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 @@ -94,21 +94,25 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan } - public void saveAssert(ConfigTreatmentPlan configDrug){ - Assert.isTrue(StrUtil.isEmpty(configDrug.getId()),"id 不为空"); - Assert.notNull(configDrug.getDisposalMethod(),"处置方式不允许为空"); - Assert.isTrue(configDrug.getDisposalMethod()==0 || configDrug.getDisposalMethod()==1,"处置方式不正确"); + public void saveAssert(ConfigTreatmentPlan configTreatmentPlan){ - Assert.isTrue(DisposalPlanEnum.containsCode(configDrug.getDisposalPlanId()),"处置计划不正确"); + Assert.isTrue(StrUtil.isEmpty(configTreatmentPlan.getId()),"id 不为空"); + // 校验处置方式 + Assert.notNull(configTreatmentPlan.getDisposalMethod(),"处置方式不允许为空"); + Assert.isTrue(configTreatmentPlan.getDisposalMethod()==0 || configTreatmentPlan.getDisposalMethod()==1,"处置方式不正确"); - Assert.notEmpty(configDrug.getFirstMeasures(),"一级措施不允许为空"); + // 校验处置计划 + Assert.isTrue(DisposalPlanEnum.containsCode(configTreatmentPlan.getDisposalPlanId()),"处置计划不正确"); + + // 校验一级措施 + Assert.notEmpty(configTreatmentPlan.getFirstMeasures(),"一级措施不允许为空"); //如果一级措施id为空，则判断一级措施是否已经存在，如果存在，则抛出异常 - if(StrUtil.isBlank(configDrug.getFirstMeasuresId())){ + if(StrUtil.isBlank(configTreatmentPlan.getFirstMeasuresId())){ Integer count = configTreatmentPlanService.lambdaQuery() - .eq(ConfigTreatmentPlan::getDisposalMethod, configDrug.getDisposalMethod()) - .eq(ConfigTreatmentPlan::getDisposalPlanId, configDrug.getDisposalPlanId()) - .eq(ConfigTreatmentPlan::getFirstMeasures, configDrug.getFirstMeasures()).count(); + .eq(ConfigTreatmentPlan::getDisposalMethod, configTreatmentPlan.getDisposalMethod()) + .eq(ConfigTreatmentPlan::getDisposalPlanId, configTreatmentPlan.getDisposalPlanId()) + .eq(ConfigTreatmentPlan::getFirstMeasures, configTreatmentPlan.getFirstMeasures()).count(); Assert.isFalse(count>0,"一级措施已经存在"); } }