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 184d8e9..36cad14 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 @@ -390,6 +390,7 @@ public class AntenatalExaminationFacade { public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest,Integer userId) { Patients patients = null; + Patients patients1 = null; if (!StringUtils.isEmpty(queryRequest.getPatientId())) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(queryRequest.getPatientId()); @@ -398,6 +399,7 @@ public class AntenatalExaminationFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { patients = list.get(0); + patients1=patients; } } else { List list1 =autoMatchFacade.matchOrgId(userId); @@ -407,6 +409,7 @@ public class AntenatalExaminationFacade { } //查询产妇数据 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, hospital); + patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, null); } if (null == patients) { @@ -415,7 +418,7 @@ public class AntenatalExaminationFacade { AntexListResult antexListResult = new AntexListResult(); AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setParentId(patients1.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); @@ -424,7 +427,7 @@ public class AntenatalExaminationFacade { antExChuModel = antExChulist.get(0); } //查询产前检查记录 - List list = antenatalExaminationService.findAllByParentId(patients.getId()); + List list = antenatalExaminationService.findAllByParentId(patients1.getId()); List data = new ArrayList(); if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); @@ -432,7 +435,7 @@ public class AntenatalExaminationFacade { } antexListResult.convertToResult(list, patients, antExChulist); - antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); + antexListResult.setIsSieve(cap(patients.getLastMenses(), patients1.getId())); antexListResult.setRiskFactor(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); }