diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index da2fd12..3411834 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6371,7 +6371,7 @@ public class ViewFacade { List list; String patientId = getPatientId(idCard,hospitalId); - if (StringUtils.isNotEmpty(patientId)) { +// if (StringUtils.isNotEmpty(patientId)) { //衡水市 if ("12".equals(cityId)) { @@ -6383,9 +6383,9 @@ public class ViewFacade { } - } else { - list = patientsService.queryPatient1(patientsQuery, "created"); - } +// } else { +// list = patientsService.queryPatient1(patientsQuery, "created"); +// } List> deliverList = new ArrayList<>(); @@ -6657,9 +6657,13 @@ public class ViewFacade { with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); if (CollectionUtils.isNotEmpty(models)) { MaternalDeliverModel deliverModel = models.get(0); - Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("pid"). + String parentId = deliverModel.getParentId(); + Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(parentId)), Patients.class); + + Patients buildPatient = mongoTemplate.findOne(Query.query(Criteria.where("pid"). is(deliverModel.getPid()).and("hospitalId").is(hospitalId).and("type").is(3).is(hospitalId).and("yn").is(YnEnums.YES.getId())), Patients.class); - if (patientsModel != null) { + + if (patientsModel != null && buildPatient != null) { return patientsModel.getId(); } }