diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
index 27245c9..7f52d21 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
@@ -208,7 +208,7 @@ public class DiagnoseEnums {
         FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""),
 
         //血压
-        XZY(64, "舒张压", 19, TypeEnums.SZ.getId(), 0, ""),
+        SZY(64, "舒张压", 19, TypeEnums.SZ.getId(), 0, ""),
         SSY(65, "收缩压", 19, TypeEnums.SZ.getId(), 0, ""),
 
 
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 eab5f09..a68c163 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
@@ -3927,13 +3927,77 @@ public class AntenatalExaminationFacade {
                 //血压
                 if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) {
                     Map map = antExcAddRequest.getBp();
+                    String ssy = null;
+                    String szy = null;
+                    try {
+                        ssy = map.get("ssy") + "";
+                        szy = map.get("szy") + "";
+                    } catch (Exception e) {
+
+                    }
                     List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xy.getId());
                     if (CollectionUtils.isNotEmpty(ybjcItems)) {
                         for (DiagnoseItemModel item : ybjcItems) {
-                            if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) {
-                                list.addAll(item.getRiskIds());
-                            } else if ((double) map.get("szy") > Double.valueOf(item.getValueThree()) && (double) map.get("szy") < Double.valueOf(item.getValueFour())) {
-                                list.addAll(item.getRiskIds());
+                            //1.判断是否为三个值还是七个值
+                            if (StringUtils.isEmpty(item.getValueFour())) {
+                                if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
+                                        && compare(item.getValueTwo(), item.getValueThree(), szy)) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                                if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
+                                        && compare(item.getValueTwo(), item.getValueThree(), ssy)) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                                //七个值
+                            } else {
+                                if ("1".equals(item.getValueFour())) {
+                                    if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
+                                            && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
+                                        list.addAll(item.getRiskIds());
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
+                                            && compare(item.getValueSix(), item.getValueSeven(), szy)) {
+                                        list.addAll(item.getRiskIds());
+
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), szy) &&
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
+                                            && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
+                                        list.addAll(item.getRiskIds());
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), szy) &&
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
+                                            && compare(item.getValueSix(), item.getValueSeven(), szy)) {
+                                        list.addAll(item.getRiskIds());
+                                    }
+
+                                } else if ("2".equals(item.getValueFour())) {
+                                    if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
+                                                    && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
+                                        list.addAll(item.getRiskIds());
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
+                                                    && compare(item.getValueSix(), item.getValueSeven(), szy)) {
+                                        list.addAll(item.getRiskIds());
+
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), szy) ||
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
+                                                    && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
+                                        list.addAll(item.getRiskIds());
+                                    } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
+                                            && compare(item.getValueTwo(), item.getValueThree(), szy) ||
+                                            String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
+                                                    && compare(item.getValueSix(), item.getValueSeven(), szy)) {
+                                        list.addAll(item.getRiskIds());
+                                    }
+                                }
                             }
                         }
                     }