diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index 3eef698..8cb8164 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -33,7 +33,7 @@ public class AntenatalExaminationService { public List findAllByParentId(String parentId) { Assert.notNull(parentId, "findAllByParentId parentId must not be null."); MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(),MongoOper.IS); - return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.ASC,"created")); + return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.DESC,"created")); } 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 466e9ca..43e4c86 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 @@ -122,7 +122,7 @@ public class AntenatalExaminationFacade { * * @return */ - private List findLastRisk(String parentId) { + public List findLastRisk(String parentId) { List list = antenatalExaminationService.findAllByParentId(parentId); AntenatalExaminationModel model = null; if (CollectionUtils.isNotEmpty(list)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 8682162..8607e11 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -237,7 +237,7 @@ public class PatientFacade { patientBaseResult.convert(patients); } try { - patientBaseResult.setRiskFactor(antenatalExaminationFacade.queryRisk(patients.getFirstRiskFactorId())); + patientBaseResult.setRiskFactor(antenatalExaminationFacade.findLastRisk(patients.getId())); } catch (Exception e) { } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);