bugfix:修复问题

dev_2.0.0
liu 1 year ago
parent 31b1b34b12
commit 1766021c2b

@ -62,7 +62,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
@Override @Override
public List<Disease> queryPrimaryCanChooseList() { public List<Disease> queryPrimaryCanChooseList() {
return diseaseService.list(); return diseaseService.lambdaQuery().eq(Disease::getDiseaseType, 0).list();
} }
@Override @Override
@ -204,7 +204,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
throw new BusinessException("初步诊断不能为空"); throw new BusinessException("初步诊断不能为空");
} }
// 如果 != 1 ,不是暂存,那么就校验电子病历是否填写 // 如果 != 1 ,不是暂存,那么就校验电子病历是否填写
if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()){ if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()) {
// 校验,如果没有填写病历,那么就不允许诊毕 // 校验,如果没有填写病历,那么就不允许诊毕
Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count(); Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count();
if (count < 1) { if (count < 1) {
@ -215,7 +215,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
for (PrimaryConfirmNodeReqVO node : reqVOList) { for (PrimaryConfirmNodeReqVO node : reqVOList) {
// 如果 != 1 ,不是暂存,那么就校验初步诊断是否填写 // 如果 != 1 ,不是暂存,那么就校验初步诊断是否填写
if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()){ if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()) {
if (ObjectUtil.isEmpty(node.getExcludeFlag()) && 0 != node.getExcludeFlag() && 1 != node.getExcludeFlag()) { if (ObjectUtil.isEmpty(node.getExcludeFlag()) && 0 != node.getExcludeFlag() && 1 != node.getExcludeFlag()) {
throw new BusinessException("是否排除不能为空或诊断不正确"); throw new BusinessException("是否排除不能为空或诊断不正确");
} }

Loading…
Cancel
Save