diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index a4a415c..5986ae0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -539,6 +539,8 @@ public class BabyCheckFacade extends BaseServiceImpl { Date nextDate = bm.getNextDate(); if (nextDate != null) { babyAfterVisitService.addOrUpdateAfterVisitData(bm, TYPE_CHECK, STATUS_TYPE_NO); + } else { + babyAfterVisitService.addOrUpdateAfterVisitData(bm, TYPE_CHECK, STATUS_TYPE_NULL); } bm.setId(request.getBuildId()); babyAfterVisitService.addOrUpdateAfterVisitData(bm, TYPE_STATISTICS, STATUS_TYPE_CHECK); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java index 13f62bf..02d831f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java @@ -32,6 +32,8 @@ public interface BabyAfterVisitService { public static final Integer STATUS_TYPE_YES = 1; /**状态:作废*/ public static final Integer STATUS_TYPE_NO = 2; + /**状态:下次预约时间null*/ + public static final Integer STATUS_TYPE_NULL = 3; /**状态:更新*/ public static final Integer STATUS_TYPE_UPDATE = 3; /**状态:预建档/临时建档*/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index f4f1f1a..33dc8b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -456,24 +456,20 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end)); } } - //临时处理等待董勤回来处理 - boolean flag = true; // 追访结果 1-显示 当前时间 > 预约时间 // 2-显示 当前时间 < 预约时间 String afterVisitResult = request.getAfterVisitResult(); if (Objects.equals("1", afterVisitResult)) { if (!appointmentTimeBoolean && !nonNull) { query.addCriteria(Criteria.where("appointmentTime").lte(new Date())); - flag = false; } } else if (Objects.equals("2", afterVisitResult)) { if (!appointmentTimeBoolean && !nonNull) { query.addCriteria(Criteria.where("appointmentTime").gt(new Date())); - flag = false; } } - if (!appointmentTimeBoolean && !nonNull && flag) { + if (!appointmentTimeBoolean && !nonNull ) { query.addCriteria(Criteria.where("appointmentTime").lt(new Date())); } @@ -823,7 +819,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { // 档案转正、儿保检查 addOrUpdate if (Objects.equals(TYPE_BUILD, type) || Objects.equals(TYPE_CHECK, type)) { - if (Objects.equals(STATUS_TYPE_NO, statusType)) { + if (Objects.equals(STATUS_TYPE_NO, statusType) || Objects.equals(STATUS_TYPE_NULL, statusType)) { BabyModel babyModel = (BabyModel) model; babyModelId = babyModel.getId(); models.add(babyModel); @@ -836,6 +832,9 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { if (YnEnums.YES.getId() == yn) { Date nextDate = babyModel.getNextDate(); nextDate = nextDate == null ? new Date() : nextDate; + if (Objects.equals(TYPE_CHECK, type)) { + nextDate = new Date(); + } mongoTemplate.updateFirst(query, Update.update("appointmentTime", nextDate), BabyAfterVisitInfoModel.class); if (Objects.equals(TYPE_BUILD, type)) { // 针对档案转正时,将其状态直接更新为作废 @@ -930,10 +929,10 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { } BabyAfterVisitInfoDetailModel model = request; model.setCreateTime(new Date()); - model.setAfterVisitTime(new Date(afterVisitTime.getTime())); + model.setAfterVisitTime(new Date(afterVisitTime.getTime() - 28800000)); if (appointmentTime != null) { if (!"1".equals(type)) { - model.setAppointmentTime(new Date(appointmentTime.getTime())); + model.setAppointmentTime(new Date(appointmentTime.getTime() - 28800000)); } } model.setYn(1); @@ -942,10 +941,10 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { visitInfoModel.setAfterVisitResult(afterVisitResult); if (Objects.equals(isAppointment, "1")) { if (!"1".equals(type)) { - visitInfoModel.setAppointmentTime(appointmentTime); + visitInfoModel.setAppointmentTime(model.getAppointmentTime()); } } - visitInfoModel.setAfterVisitTime(afterVisitTime); + visitInfoModel.setAfterVisitTime(model.getAfterVisitTime()); visitInfoModel.setAfterVisitUser(afterVisitUser); visitInfoModel.setAfterVisitWay(afterVisitWay); visitInfoModel.setAfterVisitWorkflow(afterVisitWorkflow); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 7a75579..4345270 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -106,6 +106,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye Date nextCheckTime = babyEyeCheck.getNextCheckTime(); if (null != nextCheckTime) { babyAfterVisitService.addOrUpdateAfterVisitData(babyEyeCheck, TYPE_EYE_CHECK, STATUS_TYPE_NO); + } else { + babyAfterVisitService.addOrUpdateAfterVisitData(babyEyeCheck, TYPE_EYE_CHECK, STATUS_TYPE_NULL); } BabyModel model = new BabyModel(); model.setId(babyEyeCheck.getBabyId()); @@ -145,6 +147,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye Date nextCheckTime = babyEyeCheck.getNextCheckTime(); if (null != nextCheckTime) { babyAfterVisitService.addOrUpdateAfterVisitData(babyEyeCheck, TYPE_EYE_CHECK, STATUS_TYPE_NO); + } else { + babyAfterVisitService.addOrUpdateAfterVisitData(babyEyeCheck, TYPE_EYE_CHECK, STATUS_TYPE_NULL); } }