diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 3f64446..2e4c1a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1691,6 +1691,9 @@ public class AntenatalExaminationFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); Patients patients = null; Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + //获取当前用户在的医院 + List currentGroupHospital=groupsFacade.findGroupHospital(userId, false); + if (!StringUtils.isEmpty(queryRequest.getPatientId())) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(queryRequest.getPatientId()); @@ -1709,17 +1712,19 @@ public class AntenatalExaminationFacade { PatientCheckTicket checkTicket = patientCheckTicketService.getTicket(queryRequest.getBarCode()); if (null != checkTicket) { - Patients patients1 = patientsService.findOnePatientById(checkTicket.getPatientId()); - if (null != patients1) { - if (StringUtils.isNotEmpty(patients1.getSource())) { - patients = patientsService.findOnePatientById(patients1.getSource()); - } else { - patients = patients1; + if(null!=currentGroupHospital&¤tGroupHospital.contains(checkTicket.getHospitalId())){ + Patients patients1 = patientsService.findOnePatientById(checkTicket.getPatientId()); + if (null != patients1) { + if (StringUtils.isNotEmpty(patients1.getSource())) { + patients = patientsService.findOnePatientById(patients1.getSource()); + } else { + patients = patients1; + } } } } } else { - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId, false), 1, false, null, og.getbStatus() == 1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null,currentGroupHospital , 1, false, null, og.getbStatus() == 1); //查询产妇数据 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); } @@ -1732,7 +1737,7 @@ public class AntenatalExaminationFacade { // //查询是否还有其他记录 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false); // } - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId, false), 3, false, null, og.getbStatus() == 1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); //原来单机 if (null != patients) {