diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 7452852..c2e036b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -871,9 +871,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsService.updatePatientOne(patients, trackDownRecord.getParentId()); } //获取妇女建党id + ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel(); if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) { - ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel(); - if (null != trackDown.getReservatDate()) { + if (trackDown.getReservatDate() != null) { residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate()); } else { residentsArchiveModel1.setFollowupTime(new Date()); @@ -888,7 +888,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } /**冗余到追访记录表*/ TrackDownRecord trackDownRecord1 = new TrackDownRecord(); - if (null != trackDownRecord.getAppointmentDate() && trackDown.getReservatDate() != null) { + if (trackDown.getReservatDate() != null) { trackDownRecord1.setAppointmentDate(trackDown.getReservatDate()); } else { trackDownRecord1.setAppointmentDate(new Date()); @@ -896,7 +896,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (null != trackDown.getTrackDownDate()) { trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate()); } - if (null != trackDownRecord.getStop() && null != trackDown.getTrackDownTransfer()) { + if (null != trackDown.getTrackDownTransfer()) { if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { trackDownRecord1.setStop("0"); } else if (3 == trackDown.getTrackDownTransfer()) {