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 6eed7cb..30eea82 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 @@ -519,7 +519,6 @@ 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()); @@ -537,9 +536,6 @@ public class AntenatalExaminationFacade { } //查询产妇数据 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1); - /* if (null == patients) { - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null, 1); - }*/ } if (null == patients) { @@ -548,35 +544,18 @@ public class AntenatalExaminationFacade { AntexListResult antexListResult = new AntexListResult(); AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setPid(patients.getPid()); + antExChuQuery.setParentId(patients.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); - /* AntExChuModel antExChuModel = null; - if (CollectionUtils.isNotEmpty(antExChulist)) { - antExChuModel = antExChulist.get(0); - }*/ + HighScoreResult highScoreResult = findLastRisk(patients.getId(),false); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setPid(patients.getPid()); + antExQuery.setParentId(patients.getId()); //查询产前检查记录 List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - /* List data = new ArrayList(); - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { - List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - data = queryRiskName(l); - } - if(CollectionUtils.isNotEmpty(list)){ - AntenatalExaminationModel antEx= list.get(0); - try{ - if(!"{}".equals(antEx.getOtherRisk())){ - JsonUtil.str2Obj(antEx.getOtherRisk(), java.util.Map.class); - } - }catch (Exception e){ - } - data.add(); - }*/ + antexListResult.convertToResult(list, patients, antExChulist); antexListResult.setData(handlAntData(antExChulist, list)); antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));