Commit e4ef4015a69a82781c09219809922e0a97563d44
1 parent
75cea31f52
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
e4ef401
| ... | ... | @@ -6371,7 +6371,7 @@ |
| 6371 | 6371 | |
| 6372 | 6372 | List<Patients> list; |
| 6373 | 6373 | String patientId = getPatientId(idCard,hospitalId); |
| 6374 | - if (StringUtils.isNotEmpty(patientId)) { | |
| 6374 | +// if (StringUtils.isNotEmpty(patientId)) { | |
| 6375 | 6375 | //衡水市 |
| 6376 | 6376 | if ("12".equals(cityId)) |
| 6377 | 6377 | { |
| ... | ... | @@ -6383,9 +6383,9 @@ |
| 6383 | 6383 | |
| 6384 | 6384 | } |
| 6385 | 6385 | |
| 6386 | - } else { | |
| 6387 | - list = patientsService.queryPatient1(patientsQuery, "created"); | |
| 6388 | - } | |
| 6386 | +// } else { | |
| 6387 | +// list = patientsService.queryPatient1(patientsQuery, "created"); | |
| 6388 | +// } | |
| 6389 | 6389 | |
| 6390 | 6390 | List<Map<String, Object>> deliverList = new ArrayList<>(); |
| 6391 | 6391 | |
| 6392 | 6392 | |
| ... | ... | @@ -6657,9 +6657,13 @@ |
| 6657 | 6657 | with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); |
| 6658 | 6658 | if (CollectionUtils.isNotEmpty(models)) { |
| 6659 | 6659 | MaternalDeliverModel deliverModel = models.get(0); |
| 6660 | - Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("pid"). | |
| 6660 | + String parentId = deliverModel.getParentId(); | |
| 6661 | + Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(parentId)), Patients.class); | |
| 6662 | + | |
| 6663 | + Patients buildPatient = mongoTemplate.findOne(Query.query(Criteria.where("pid"). | |
| 6661 | 6664 | is(deliverModel.getPid()).and("hospitalId").is(hospitalId).and("type").is(3).is(hospitalId).and("yn").is(YnEnums.YES.getId())), Patients.class); |
| 6662 | - if (patientsModel != null) { | |
| 6665 | + | |
| 6666 | + if (patientsModel != null && buildPatient != null) { | |
| 6663 | 6667 | return patientsModel.getId(); |
| 6664 | 6668 | } |
| 6665 | 6669 | } |