diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java index fde9c96d..9e8fd557 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.druid.sql.visitor.functions.If; import com.sun.media.sound.AiffFileReader; @@ -210,6 +211,9 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { throw new BusinessException("电子病历未填写,请填写电子病例后诊毕"); } for (PrimaryConfirmReqVO reqVO : reqVOList) { + if (ObjectUtil.isEmpty(reqVO.getExcludeFlag()) && 0 != reqVO.getExcludeFlag() && 1 != reqVO.getExcludeFlag()) { + throw new BusinessException("是否排除不能为空或诊断不正确"); + } // 修改初步诊断是否被排除 diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getExcludeFlag, reqVO.getExcludeFlag()) .eq(DiagnosisPrimary::getId, reqVO.getPrimaryId()).update(); @@ -277,7 +281,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { vo.setPrimaryDiseaseName(""); } }) - .collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName)); + .collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName)); // 查询诊疗记录对应的所有检查记录 List relationList = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list(); // 根据relationId进行分组