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 8bc7084..c37f4d9 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 @@ -477,9 +477,9 @@ public class AntenatalExaminationFacade { List sortList = new ArrayList(); String hospital=autoMatchFacade.getHospitalId(userId); List listDate = new ArrayList(); - int index = 0; + if (CollectionUtils.isNotEmpty(list)) { - Patients patients2= findOnePatient(exListQueryRequest.getCardNo(),null,null,hospital,-1,false); + Patients patients2= findOnePatient(null,null,null,hospital,-1,false,exListQueryRequest.getPid()); antexListResult.convertToResult(null, patients2, null); HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); @@ -994,7 +994,7 @@ public class AntenatalExaminationFacade { * @param type 类型 1 孕妇 3 产妇 -1 不区分 * @param outHospital 是否需要查外院 */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital,String pid) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -1002,6 +1002,8 @@ public class AntenatalExaminationFacade { patientsQuery.setVcCardNo(vcCardNo); } else if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); + }else if(StringUtils.isNotEmpty(pid)){ + patientsQuery.setPid(pid); } patientsQuery.setType(type); patientsQuery.setHospitalId(hospitalId); @@ -1074,7 +1076,7 @@ public class AntenatalExaminationFacade { hospital = list1.get(0) + ""; } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false,null); } if (null == patients) {