|
|
|
@ -96,7 +96,8 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 保存无需部位的正常值(前端要求分开)
|
|
|
|
|
if (ObjectUtil.isNotEmpty(physicalToolVO.getNoLocationDefaultPhysicalIndicator())) {
|
|
|
|
|
if (ObjectUtil.isNotEmpty(physicalToolVO.getNoLocationDefaultPhysicalIndicator())
|
|
|
|
|
&& StrUtil.isNotBlank(physicalToolVO.getNoLocationDefaultPhysicalIndicator().getItemId())) {
|
|
|
|
|
if (physicalToolVO.getRequireLocation() == 0 && StrUtil.isNotBlank(physicalToolVO.getNoLocationDefaultPhysicalIndicator().getLocationId())) {
|
|
|
|
|
throw new BusinessException("无需检查位的体格检查项,检查位置必须为空");
|
|
|
|
|
}
|
|
|
|
@ -118,6 +119,8 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
|
|
|
|
|
if (nameCount > 0) {
|
|
|
|
|
throw new BusinessException("体格检查工具类型:" + physicalToolVO.getType() + " 存在重复名称");
|
|
|
|
|
}
|
|
|
|
|
// 清除旧的体格检查工具的正常值
|
|
|
|
|
defaultPhysicalIndicatorService.lambdaUpdate().eq(DefaultPhysicalIndicator::getItemId, physicalToolVO.getId()).remove();
|
|
|
|
|
// 保存体格检查工具的正常值
|
|
|
|
|
if (CollUtil.isNotEmpty(physicalToolVO.getDefaultPhysicalIndicatorList())) {
|
|
|
|
|
List<DefaultPhysicalIndicator> defaultPhysicalIndicatorList = physicalToolVO.getDefaultPhysicalIndicatorList();
|
|
|
|
@ -130,7 +133,8 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 保存无需部位的正常值(前端要求分开)
|
|
|
|
|
if (ObjectUtil.isNotEmpty(physicalToolVO.getNoLocationDefaultPhysicalIndicator())) {
|
|
|
|
|
if (ObjectUtil.isNotEmpty(physicalToolVO.getNoLocationDefaultPhysicalIndicator())
|
|
|
|
|
&& StrUtil.isNotBlank(physicalToolVO.getNoLocationDefaultPhysicalIndicator().getIndicatorValue())) {
|
|
|
|
|
if (physicalToolVO.getRequireLocation() == 0 && StrUtil.isNotBlank(physicalToolVO.getNoLocationDefaultPhysicalIndicator().getLocationId())) {
|
|
|
|
|
throw new BusinessException("无需检查位的体格检查项,检查位置必须为空");
|
|
|
|
|
}
|
|
|
|
|