jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c20e02707bc8c1d2cccf91ff460a8c62e0725ea7

Authored by [wangbo]
1 parent aa63508067
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

预约追访日期bug休改

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ c20e027
... ... @@ -871,9 +871,9 @@
871 871 patientsService.updatePatientOne(patients, trackDownRecord.getParentId());
872 872 }
873 873 //获取妇女建党id
  874 + ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel();
874 875 if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) {
875   - ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel();
876   - if (null != trackDown.getReservatDate()) {
  876 + if (trackDown.getReservatDate() != null) {
877 877 residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate());
878 878 } else {
879 879 residentsArchiveModel1.setFollowupTime(new Date());
... ... @@ -888,7 +888,7 @@
888 888 }
889 889 /**冗余到追访记录表*/
890 890 TrackDownRecord trackDownRecord1 = new TrackDownRecord();
891   - if (null != trackDownRecord.getAppointmentDate() && trackDown.getReservatDate() != null) {
  891 + if (trackDown.getReservatDate() != null) {
892 892 trackDownRecord1.setAppointmentDate(trackDown.getReservatDate());
893 893 } else {
894 894 trackDownRecord1.setAppointmentDate(new Date());
... ... @@ -896,7 +896,7 @@
896 896 if (null != trackDown.getTrackDownDate()) {
897 897 trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate());
898 898 }
899   - if (null != trackDownRecord.getStop() && null != trackDown.getTrackDownTransfer()) {
  899 + if (null != trackDown.getTrackDownTransfer()) {
900 900 if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
901 901 trackDownRecord1.setStop("0");
902 902 } else if (3 == trackDown.getTrackDownTransfer()) {