Commit 87b0e61ab10166d8c7e1bf29c14dadb8044863db
1 parent
3a8b540a73
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
87b0e61
| ... | ... | @@ -336,6 +336,7 @@ |
| 336 | 336 | calendar.setTime(new Date()); |
| 337 | 337 | calendar.add(Calendar.MONTH, -startMonthsAge); |
| 338 | 338 | start = calendar.getTime(); |
| 339 | + start = DateUtil.getDayLastSecond(start); | |
| 339 | 340 | } |
| 340 | 341 | |
| 341 | 342 | // 当月第一天 |
| ... | ... | @@ -345,6 +346,7 @@ |
| 345 | 346 | } |
| 346 | 347 | calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH)); |
| 347 | 348 | Date end = calendar.getTime(); |
| 349 | + end = DateUtil.getDayFirstSecond(end); | |
| 348 | 350 | query.addCriteria(Criteria.where("birth").gte(end).lte(start)); |
| 349 | 351 | } |
| 350 | 352 | |
| 351 | 353 | |
| ... | ... | @@ -916,14 +918,18 @@ |
| 916 | 918 | model.setCreateTime(new Date()); |
| 917 | 919 | model.setAfterVisitTime(new Date(afterVisitTime.getTime())); |
| 918 | 920 | if (appointmentTime != null) { |
| 919 | - model.setAppointmentTime(new Date(appointmentTime.getTime())); | |
| 921 | + if (!"1".equals(type)) { | |
| 922 | + model.setAppointmentTime(new Date(appointmentTime.getTime())); | |
| 923 | + } | |
| 920 | 924 | } |
| 921 | 925 | model.setYn(1); |
| 922 | 926 | mongoTemplate.insert(model); |
| 923 | 927 | BabyAfterVisitInfoModel visitInfoModel = mongoTemplate.findOne(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is(type)), BabyAfterVisitInfoModel.class); |
| 924 | 928 | visitInfoModel.setAfterVisitResult(afterVisitResult); |
| 925 | 929 | if (Objects.equals(isAppointment, "1")) { |
| 926 | - visitInfoModel.setAppointmentTime(appointmentTime); | |
| 930 | + if (!"1".equals(type)) { | |
| 931 | + visitInfoModel.setAppointmentTime(appointmentTime); | |
| 932 | + } | |
| 927 | 933 | } |
| 928 | 934 | visitInfoModel.setAfterVisitTime(afterVisitTime); |
| 929 | 935 | visitInfoModel.setAfterVisitUser(afterVisitUser); |
| ... | ... | @@ -945,8 +951,6 @@ |
| 945 | 951 | if (afterVisitWorkflow.equals(TrackDownTransferEnums.B.getId().toString())) { |
| 946 | 952 | mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is(type)), Update.update("afterVisitWorkflow", "2").set("yn", 2), BabyAfterVisitInfoModel.class); |
| 947 | 953 | } |
| 948 | - | |
| 949 | - | |
| 950 | 954 | return new BaseResponse(); |
| 951 | 955 | } |
| 952 | 956 |