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 acd1f99..fa72645 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 @@ -5649,13 +5649,15 @@ public class ViewFacade { patientsQuery.setCardNo(idCard); patientsQuery.setType(3); + String hospitalId; if (StringUtils.isNotEmpty(hospitalName)) { OrganizationQuery query = new OrganizationQuery(); query.setName(hospitalName.trim()); query.setYn(YnEnums.YES.getId()); List organizations = organizationService.queryOrganization(query); if (CollectionUtils.isNotEmpty(organizations)) { - patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); + hospitalId = String.valueOf(organizations.get(0).getId()); + patientsQuery.setHospitalId(hospitalId); } else { deliverMap.put("motherinfo", new ArrayList<>()); return deliverMap; @@ -5668,7 +5670,7 @@ public class ViewFacade { List list; String patientId = getPatientId(idCard); if (StringUtils.isNotEmpty(patientId)) { - list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId)), Patients.class); + list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class); } else { list = patientsService.queryPatient1(patientsQuery, "created"); } @@ -5916,12 +5918,7 @@ public class ViewFacade { String parentId = deliverModel.getParentId(); Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(parentId)), Patients.class); if (patientsModel != null) { - String sourceId = patientsModel.getSource(); - if (StringUtils.isNotEmpty(sourceId)) { - return sourceId; - } else { - return patientsModel.getId(); - } + return patientsModel.getId(); } } }