Commit 0f47e3106d7ef14ab5b9848ca98cc0b9fe284fd1
1 parent
894984ffed
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 9 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
0f47e31
| ... | ... | @@ -1068,15 +1068,14 @@ |
| 1068 | 1068 | resMap.put("checkList", list); |
| 1069 | 1069 | |
| 1070 | 1070 | //秦皇岛需求，查询最后一次检查的高危详情 |
| 1071 | - if(CollectionUtils.isNotEmpty(list)){ | |
| 1072 | - String babyCheckId=list.get(list.size()-1).get("id"); | |
| 1073 | - Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId); | |
| 1074 | - Query queryBabyCheck=Query.query(criterBabyCheck); | |
| 1075 | - BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); | |
| 1076 | - resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():""); | |
| 1077 | - }else { | |
| 1078 | - resMap.put("qhdHighRiskInfo",""); | |
| 1079 | - } | |
| 1071 | +// if(CollectionUtils.isNotEmpty(list)){ | |
| 1072 | +// Criteria criterBabyCheck=Criteria.where("id").is(list.get(list.size()-1).get("id")); | |
| 1073 | +// Query queryBabyCheck=Query.query(criterBabyCheck); | |
| 1074 | +// BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); | |
| 1075 | +// resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():""); | |
| 1076 | +// }else { | |
| 1077 | +// resMap.put("qhdHighRiskInfo",""); | |
| 1078 | +// } | |
| 1080 | 1079 | |
| 1081 | 1080 | |
| 1082 | 1081 | br.setData(resMap); |
| ... | ... | @@ -1677,7 +1676,7 @@ |
| 1677 | 1676 | //秦皇岛需求，查询最后一次检查的高危详情 |
| 1678 | 1677 | if(null!=id){ |
| 1679 | 1678 | Criteria criterList=Criteria.where("buildId").is(id); |
| 1680 | - Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "checkDate")); | |
| 1679 | + Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "created")); | |
| 1681 | 1680 | List<BabyCheckModel> babyCheckList=mongoTemplate.find(queryList, BabyCheckModel.class); |
| 1682 | 1681 | if(CollectionUtils.isNotEmpty(babyCheckList)){ |
| 1683 | 1682 | Criteria criterBabyCheck=Criteria.where("id").is(babyCheckList.get(0).getId()); |