diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 74b73dd..2c74acd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -3444,6 +3444,7 @@ public class TestController extends BaseController { @ResponseBody public String syncTrckDownNextTime() { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setLastMensesStart(DateUtil.addMonth(new Date(),-10)); downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); int batchSize = 1000; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 919e896..1396977 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -812,6 +812,7 @@ public class TrackDownFacade { pageResult.setGrid(new ArrayList<>()); return RespBuilder.buildSuccess(pageResult); } + System.out.println(downRecordQuery.convertToQuery().convertToMongoQuery().toString()); List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 995d2af..47c03b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -98,8 +98,11 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("code").is(code)); } - PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class); - if (one == null) { + List list = mongoTemplate.find(query, PreEugenicsBaseModel.class); + if (CollectionUtils.isEmpty(list)) { + + PreEugenicsBaseModel one = new PreEugenicsBaseModel(); + if (StringUtils.isNotEmpty(cardNo)) { ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class); if (model == null) { @@ -186,10 +189,12 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen baseResponse.setObject(one); return baseResponse; } + + list.add(one); } BaseResponse baseResponse = new BaseResponse(); - baseResponse.setObject(one); + baseResponse.setObject(list); return baseResponse; }