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 8cf1551..13959ab 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 @@ -1762,7 +1762,19 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { patients = list.get(0); } - } else { + } else if(StringUtils.isNotEmpty(queryRequest.getBarCode())){ + 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; + } + } + } + }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, hospitalId, 1, false, null, false); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java index 5912607..6081a97 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java @@ -23,6 +23,16 @@ public class AntenatalExaminationQueryRequest { private String patientId; + private String barCode; + + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + public String getPatientId() { return patientId; }