diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java index b6abe44a..6d92c23f 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java @@ -2,14 +2,12 @@ package com.supervision.manage.controller; import com.supervision.manage.service.AskQuestionLibraryManageService; -import com.supervision.model.DiseaseAncillary; import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryResVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java deleted file mode 100644 index fab25a00..00000000 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.supervision.manage.service; - -import com.supervision.model.ConfigTreatmentPlan; -import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; - -import java.util.List; - -public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlanManageService{ - @Override - public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) { - return null; - } - - @Override - public List queryList(Integer disposalMethod) { - return null; - } - - @Override - public ConfigTreatmentPlanWrapVo findById(String id) { - return null; - } -} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java index 7e8baa14..37e8a6b7 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java @@ -1,15 +1,22 @@ 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.manage.service.DiseaseAncillaryManageService; +import com.supervision.model.ConfigTreatmentPlan; import com.supervision.model.DiseaseAncillary; import com.supervision.service.DiseaseAncillaryService; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; import com.supervision.vo.manage.DiseaseAncillaryResVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Objects; + @Service @RequiredArgsConstructor public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManageService { @@ -28,6 +35,8 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage assertDiseaseAncillary(diseaseAncillary); + Assert.isFalse(checkIfPresent(diseaseAncillary),"数据已存在!"); + diseaseAncillaryService.save(diseaseAncillary); return diseaseAncillary; @@ -52,6 +61,8 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage private void assertDiseaseAncillary(DiseaseAncillary diseaseAncillary){ + Assert.isNull(diseaseAncillary.getId(),"id不为空"); + Assert.isTrue(StrUtil.isNotEmpty(diseaseAncillary.getDiseaseId()),"疾病id不能为空"); Assert.notNull(diseaseAncillary.getPrimarilyDiagnosisCriteriaFlag(),"初步诊断依据不能为空"); @@ -71,4 +82,36 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage Assert.notNull(diseaseAncillary.getExpectedDiagnosisResult(),"预期诊断结果不能为空"); } + + + private boolean checkIfPresent(DiseaseAncillary diseaseAncillary){ + + return Objects.isNull(findByDiseaseIdAndItemId(diseaseAncillary.getDiseaseId(), diseaseAncillary.getItemId())); + } + + + private DiseaseAncillary findByDiseaseIdAndItemId(String diseaseId,String itemId){ + List list = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getDiseaseId, diseaseId).eq(DiseaseAncillary::getItemId, itemId).list(); + if (CollUtil.isEmpty(list)){ + return null; + } + return list.get(0); + } + + public static class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlanManageService { + @Override + public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) { + return null; + } + + @Override + public List queryList(Integer disposalMethod) { + return null; + } + + @Override + public ConfigTreatmentPlanWrapVo findById(String id) { + return null; + } + } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java index 2f7d3259..f8a39b15 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java @@ -1,12 +1,14 @@ 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.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.exception.BusinessException; import com.supervision.manage.service.DiseaseManageService; import com.supervision.model.Disease; +import com.supervision.model.DiseaseAncillary; import com.supervision.service.DiseaseService; import com.supervision.vo.manage.DiseaseVo; import lombok.RequiredArgsConstructor; @@ -22,16 +24,8 @@ public class DiseaseManageServiceImpl implements DiseaseManageService { @Override public Disease saveDisease(Disease disease) { - if (StrUtil.hasEmpty(disease.getDiseaseName(),disease.getDiseaseNameAlias(),disease.getCode())){ - throw new BusinessException("diseaseName,diseaseNameAlias,code is not allow empty"); - } - if (CollUtil.isNotEmpty(this.queryByAnyCondition(disease.getCode(),disease.getDiseaseName(), - disease.getDiseaseNameAlias()))){ - throw new BusinessException("类目编码: "+disease.getCode()+",或疾病名称: "+disease.getDiseaseName()+ - ",或疾病分类别名: "+disease.getDiseaseNameAlias()+" 已存在"); - } + assertDisease(disease); - disease.setId(null); disease.setStatus(0); diseaseService.save(disease); @@ -42,9 +36,7 @@ public class DiseaseManageServiceImpl implements DiseaseManageService { @Override public boolean updateDisease(Disease disease) { - if (StrUtil.isEmpty(disease.getId())){ - throw new BusinessException("id is not allow empty"); - } + Assert.isTrue(StrUtil.isNotEmpty(disease.getId()),"id is not allow empty"); return diseaseService.updateById(disease); @@ -85,4 +77,21 @@ public class DiseaseManageServiceImpl implements DiseaseManageService { return diseaseService.lambdaQuery().eq(Disease::getCode,code).list(); } + private void assertDisease(Disease disease){ + + Assert.isNull(disease.getId(),"id 不为空"); + + Assert.isTrue(StrUtil.isNotEmpty(disease.getDiseaseName()),"疾病名称不能为空"); + + Assert.isTrue(StrUtil.isNotEmpty(disease.getDiseaseNameAlias()),"疾病别名不能为空"); + + Assert.isTrue(StrUtil.isNotEmpty(disease.getCode()),"疾病编码不能为空"); + + List diseases = this.queryByAnyCondition(disease.getCode(), disease.getDiseaseName(), disease.getDiseaseNameAlias()); + Assert.isTrue(CollUtil.isEmpty(diseases),"类目编码: {},或疾病名称: {},或疾病分类别名: {} 已存在", + disease.getCode(),disease.getDiseaseName(),disease.getDiseaseNameAlias()); + + + } + }