Merge remote-tracking branch 'origin/2.0' into 2.0

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -1273,7 +1273,7 @@ public class FollowUpService {
            ServiceItemPlanDO itemPlanDO = serviceItemPlanDao.findByRelationCode(id);
            if(itemPlanDO!=null){
                ServiceItemPlanDO serviceItemPlanDO = serviceItemPlanDao.findByPlanIdAndPlanDetailIdAndPlanTime(itemPlanDO.getPlanId(), itemPlanDO.getPlanDetailId(), DateUtil.dateToStrLong(followup.getFollowupNextDate()));
                if (StringUtils.isNoneBlank(plandate)) {
                if (StringUtils.isNoneBlank(plandate)&&serviceItemPlanDO!=null) {
                    followup.setFollowupNextDate(DateUtil.strToDate(plandate));
                    Followup nextFollowup = followupDao.findById(Long.valueOf(serviceItemPlanDO.getRelationCode())).orElse(null);
                    nextFollowup.setFollowupDate(DateUtil.strToDateLong(plandate));
@@ -1722,19 +1722,18 @@ public class FollowUpService {
                if(StringUtils.isNotBlank(nextFollowupTime)){
                    f.setFollowupDate(DateUtil.strToDate(nextFollowupTime));
                    f.setFollowupPlanDate(DateUtil.strToDate(nextFollowupTime));
                    ServiceItemPlanDO itemPlanDO = serviceItemPlanDao.findByRelationCode(f.getId()+"");
                    if(itemPlanDO!=null){
                        itemPlanDO.setPlanTime(nextFollowupTime);
                        serviceItemPlanDao.save(itemPlanDO);
                    }
                }
                if(StringUtils.isNotBlank(nextFollowupWay)){
                    f.setFollowupType(nextFollowupWay);
                }
                followupDao.save(f);
            }
            if(StringUtils.isNotBlank(nextFollowupTime)){
                ServiceItemPlanDO itemPlanDO = serviceItemPlanDao.findByRelationCode(followupId+"");
                if(itemPlanDO!=null){
                    itemPlanDO.setPlanTime(nextFollowupTime);
                    serviceItemPlanDao.save(itemPlanDO);
                }
            }
        }
    }