Commit ef5b0e131b14493ca79eeafd4c4a2615af796c86
1 parent
c540a3fbe1
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
ef5b0e1
| ... | ... | @@ -1588,21 +1588,22 @@ |
| 1588 | 1588 | week = DateUtil.getWeekDesc(antexc.getLastMenses(), antexc.getCheckTime()); |
| 1589 | 1589 | // number = findNumberByList("checkTime", "pid", antexc.getPid(), antexc, AntExChuModel.class); |
| 1590 | 1590 | phone = findPhoneByPid(antexc.getPid()); |
| 1591 | - | |
| 1592 | 1591 | id = antexc.getId();/** 处理排序 */ |
| 1593 | - List<AntExChuModel> AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid())), AntExChuModel.class); | |
| 1592 | + List<AntExChuModel> AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid()).and("parentId").is(antexc.getParentId())), AntExChuModel.class); | |
| 1594 | 1593 | if(CollectionUtils.isNotEmpty(AntExChuModel)) { |
| 1595 | 1594 | for (AntExChuModel antExChuModel : AntExChuModel) { |
| 1596 | 1595 | sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCheckTime())); |
| 1597 | 1596 | } |
| 1598 | 1597 | } |
| 1599 | - List<AntenatalExaminationModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid())), AntenatalExaminationModel.class); | |
| 1598 | + List<AntenatalExaminationModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid()).and("parentId").is(antexc.getParentId())), AntenatalExaminationModel.class); | |
| 1600 | 1599 | if(CollectionUtils.isNotEmpty(antExChuModels)) { |
| 1601 | 1600 | for (AntenatalExaminationModel antExChuModel : antExChuModels) { |
| 1602 | 1601 | sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCreated())); |
| 1603 | 1602 | } |
| 1604 | 1603 | } |
| 1605 | 1604 | |
| 1605 | + | |
| 1606 | + | |
| 1606 | 1607 | } else { |
| 1607 | 1608 | AntenatalExaminationModel antenatal = mongoTemplate.findById(usedId, AntenatalExaminationModel.class); |
| 1608 | 1609 | if(antenatal != null) { |
| ... | ... | @@ -1617,7 +1618,7 @@ |
| 1617 | 1618 | sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCreated())); |
| 1618 | 1619 | } |
| 1619 | 1620 | } |
| 1620 | - List<AntExChuModel> AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antenatal.getPid())), AntExChuModel.class); | |
| 1621 | + List<AntExChuModel> AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antenatal.getPid()).and("parentId").is(antenatal.getParentId())), AntExChuModel.class); | |
| 1621 | 1622 | if(CollectionUtils.isNotEmpty(AntExChuModel)) { |
| 1622 | 1623 | for (AntExChuModel antExChuModel : AntExChuModel) { |
| 1623 | 1624 | sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCheckTime())); |