jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit bc490f3ec122d134f6034860c1997f012deffb13

Authored by liquanyu
1 parent 8a11b9c790
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 3 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ bc490f3
... ... @@ -1010,7 +1010,8 @@
1010 1010 if (trackDown.getTrackDownDateType() == TrackDownDateEnums.C.getId())
1011 1011 {
1012 1012 String fid = "";
1013   - List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("yn").is(YnEnums.YES.getId()).and("lastMenses").gte(patients.getLastMenses())), AntenatalExaminationModel.class);
  1013 + List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).
  1014 + and("yn").is(YnEnums.YES.getId()).and("checkDate").gte(patients.getLastMenses())), AntenatalExaminationModel.class);
1014 1015 if (CollectionUtils.isNotEmpty(examinationModel)) {
1015 1016 AntenatalExaminationModel model = examinationModel.get(0);
1016 1017 fid = model.getId();
... ... @@ -1020,7 +1021,7 @@
1020 1021 else
1021 1022 {
1022 1023 List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("yn").
1023   - is(YnEnums.YES.getId()).and("lastMenses").gte(patients.getLastMenses())), AntExChuModel.class);
  1024 + is(YnEnums.YES.getId()).and("checkTime").gte(patients.getLastMenses())), AntExChuModel.class);
1024 1025 if (CollectionUtils.isNotEmpty(antExChuModels)) {
1025 1026 AntExChuModel model = antExChuModels.get(0);
1026 1027 model.setNextCheckTime(trackDown.getReservatDate());