diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 9078844..8457fe7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1076,42 +1076,44 @@ public class BabyBookbuildingFacade {
         patientsQuery.setCardNo(cardNo);
         patientsQuery.setYn(YnEnums.YES.getId());
 
-
-        List listHighRisk = new ArrayList();
         List<Patients> list = patientsService.queryPatient(patientsQuery);
         Patients patients = null;
+        List resutls = null;
         if (CollectionUtils.isNotEmpty(list)) {
             patients = list.get(0);
 
-            AntExChuQuery antExChuQuery = new AntExChuQuery();
-            antExChuQuery.setParentId(patients.getId());
-            antExChuQuery.setYn(YnEnums.YES.getId());
-            //查询产前检查记录
-            List checkList = antenatalExaminationService.findAllByParentId(patients.getId());
-
-            String highRisk = "";
-            if (CollectionUtils.isNotEmpty(checkList)) {
-                AntenatalExaminationModel model = (AntenatalExaminationModel) checkList.get(0);
-                highRisk = model.getRiskFactor();
-            } else {
-
-                //获取初诊记录
-                List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
-                AntExChuModel antExChuModel = null;
-                if (CollectionUtils.isNotEmpty(antExChulist)) {
-                    antExChuModel = antExChulist.get(0);
-                }
-                if (antExChuModel != null) {
-                    highRisk = antExChuModel.getHighrisk();
-                }
-
-            }
-
-            if (!StringUtils.isEmpty(highRisk)) {
-                listHighRisk = JsonUtil.toList(highRisk, List.class);
-            }
+            HighScoreResult res = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
+            resutls = res.getHighRisk();
         }
-        List resutls =  queryRisk(listHighRisk);
+//            AntExChuQuery antExChuQuery = new AntExChuQuery();
+//            antExChuQuery.setParentId(patients.getId());
+//            antExChuQuery.setYn(YnEnums.YES.getId());
+//            //查询产前检查记录
+//            List checkList = antenatalExaminationService.findAllByParentId(patients.getId());
+//
+//            String highRisk = "";
+//            if (CollectionUtils.isNotEmpty(checkList)) {
+//                AntenatalExaminationModel model = (AntenatalExaminationModel) checkList.get(0);
+//                highRisk = model.getRiskFactor();
+//            } else {
+//
+//                //获取初诊记录
+//                List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
+//                AntExChuModel antExChuModel = null;
+//                if (CollectionUtils.isNotEmpty(antExChulist)) {
+//                    antExChuModel = antExChulist.get(0);
+//                }
+//                if (antExChuModel != null) {
+//                    highRisk = antExChuModel.getHighrisk();
+//                }
+//
+//            }
+//
+//            if (!StringUtils.isEmpty(highRisk)) {
+//                listHighRisk = JsonUtil.toList(highRisk, List.class);
+//            }
+//        }
+//        List resutls =  queryRisk(listHighRisk);
 
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);