Commit f5e25fb28c571dda037070455e4a51fa786b886a
1 parent
fce1171342
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
f5e25fb
| ... | ... | @@ -1205,17 +1205,18 @@ |
| 1205 | 1205 | |
| 1206 | 1206 | AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); |
| 1207 | 1207 | antExRecordQuery.setPid(patients.getPid()); |
| 1208 | - List<AntExRecordModel> recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime"); | |
| 1208 | + List<AntExRecordModel> recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); | |
| 1209 | 1209 | System.out.println(recordModels.size()); |
| 1210 | 1210 | if (CollectionUtils.isNotEmpty(recordModels) && recordModels.size() > 1) |
| 1211 | 1211 | { |
| 1212 | 1212 | TrackCountRecord record = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "created")), TrackCountRecord.class); |
| 1213 | 1213 | System.out.println("record="+record); |
| 1214 | 1214 | AntExRecordModel recordModel = recordModels.get(recordModels.size() - 2); |
| 1215 | + System.out.println("recordModel="+recordModel); | |
| 1215 | 1216 | System.out.println(recordModel.getId()); |
| 1216 | 1217 | System.out.println(DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime())); |
| 1217 | - System.out.println(DateUtil.getyyyy_MM_dd(nextCheckTime)); | |
| 1218 | - if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(nextCheckTime))) | |
| 1218 | + System.out.println(DateUtil.getyyyy_MM_dd(checkTime)); | |
| 1219 | + if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(checkTime))) | |
| 1219 | 1220 | { |
| 1220 | 1221 | |
| 1221 | 1222 | record.setZsCheckStatus(1); |
| 1222 | 1223 | |
| 1223 | 1224 | |
| ... | ... | @@ -1248,10 +1249,14 @@ |
| 1248 | 1249 | { |
| 1249 | 1250 | List<String> rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); |
| 1250 | 1251 | Integer day = getTrackDay(rlevel, configs); |
| 1252 | + System.out.println("day="+day); | |
| 1251 | 1253 | if (day != null) |
| 1252 | 1254 | { |
| 1255 | + System.out.println(checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime()); | |
| 1256 | + System.out.println(checkTime.getTime() >= recordModel.getNextCheckTime().getTime()); | |
| 1253 | 1257 | if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime() && checkTime.getTime() >= recordModel.getNextCheckTime().getTime()) |
| 1254 | 1258 | { |
| 1259 | + | |
| 1255 | 1260 | record.setBackStatus(1); |
| 1256 | 1261 | Query query = Query.query(Criteria.where("_id").is(record.getId())); |
| 1257 | 1262 | Update update = MongoConvertHelper |