diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 8abc07c2..2297c3ce 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -12,11 +12,14 @@ import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO; import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -110,13 +113,20 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService log.info("删除管理节点信息失败"); throw new ServiceException("修改专病路径管理节点信息失败"); } - for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { - diseaseNode.setRouteId(specialDiseaseRoute.getId()); - diseaseNode.setRouteName(specialDiseaseNode.getRouteName()); - diseaseNode.setUpdateTime(LocalDateTime.now()); - diseaseNode.setUpdateBy(SecurityUtils.getUsername()); + if (CollectionUtils.isEmpty(specialDiseaseNode.getSpecialDiseaseNodeList())) { + return AjaxResult.success(); } - int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList()); + ArrayList specialDiseaseNodeVOS = new ArrayList<>(); + for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { + if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) { + diseaseNode.setRouteId(specialDiseaseRoute.getId()); + diseaseNode.setRouteName(specialDiseaseNode.getRouteName()); + diseaseNode.setUpdateTime(LocalDateTime.now()); + diseaseNode.setUpdateBy(SecurityUtils.getUsername()); + specialDiseaseNodeVOS.add(diseaseNode); + } + } + int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNodeVOS); if (insertNodeCount < 0) { log.info("新增管理节点信息失败"); throw new ServiceException("修改专病路径管理节点信息失败");