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 6bc0813..8bc7084 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 @@ -463,7 +463,7 @@ public class AntenatalExaminationFacade { * @param exListQueryRequest * @return */ - public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest) { + public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest,Integer userId) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(exListQueryRequest.getCardNo()); patientsQuery.setYn(YnEnums.YES.getId()); @@ -475,11 +475,12 @@ public class AntenatalExaminationFacade { Map map = new HashMap(); List sortList = new ArrayList(); - + String hospital=autoMatchFacade.getHospitalId(userId); List listDate = new ArrayList(); int index = 0; if (CollectionUtils.isNotEmpty(list)) { - antexListResult.convertToResult(null, list.get(0), null); + Patients patients2= findOnePatient(exListQueryRequest.getCardNo(),null,null,hospital,-1,false); + antexListResult.convertToResult(null, patients2, null); HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); antexListResult.setRiskFactor(highScoreResult.getHighRisk());