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 6cd5bb6..5c79b46 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
@@ -1369,30 +1369,46 @@ public class PatientFacade extends BaseServiceImpl {
         //查询符合条件的孕妇
         StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
         stopWatch.start();
-
+        String twinsType= riskPatientsQueryRequest.getTwinsType();
         Query yn = null;
-        if ("1".equals(riskPatientsQueryRequest.getTwinsType())) {
+        if ("1".equals(twinsType)) {
             Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1));
-        } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("2".equals(twinsType)) {
             Criteria criteria2 = Criteria.where("name").is("妊娠期高血压");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
-        } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("3".equals(twinsType)) {
             Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
-        } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("4".equals(twinsType)) {
             Criteria criteria4 = Criteria.where("name").is("慢性高血压合并妊娠");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
-        } else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("5".equals(twinsType)) {
             Criteria criteria5 = Criteria.where("name").is("妊娠期高血压性心脏病");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5));
-        } else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("6".equals(twinsType)) {
             Criteria criteria6 = Criteria.where("name").is("急性肾脏疾病伴高血压");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria6));
-        } else if ("7".equals(riskPatientsQueryRequest.getTwinsType())) {
+        } else if ("7".equals(twinsType)) {
             Criteria criteria7 = Criteria.where("name").is("慢性肾脏疾病伴高血压");
             yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria7));
-        } else {
+        } else if ("8".equals(twinsType)){
+            Criteria criteria8 = Criteria.where("name").is("妊娠期高血压疾病病史");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria8));
+
+        }else if ("9".equals(twinsType)){
+            Criteria criteria9 = Criteria.where("name").is("重度子痫前期");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria9));
+        }else if ("10".equals(twinsType)){
+            Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria10));
+        }/*else if ("11".equals(twinsType)){
+            Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11));
+        }*/else if ("11".equals(twinsType)){
+            Criteria criteria11 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11));
+        }else {
             Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）");
             Criteria criteria2 = Criteria.where("name").is("妊娠期高血压");
             Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）");
@@ -1400,7 +1416,12 @@ public class PatientFacade extends BaseServiceImpl {
             Criteria criteria5 = Criteria.where("name").is("妊娠期高血压性心脏病");
             Criteria criteria6 = Criteria.where("name").is("急性肾脏疾病伴高血压");
             Criteria criteria7 = Criteria.where("name").is("慢性肾脏疾病伴高血压");
-            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7));
+            Criteria criteria8 = Criteria.where("name").is("妊娠期高血压疾病病史");
+            Criteria criteria9 = Criteria.where("name").is("重度子痫前期");
+            Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期");
+           // Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）");
+            Criteria criteria12 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
+            yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12));
         }
         List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
         List <String> rFactorList = new ArrayList <>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java
index df4d64e..bdb1d68 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java
@@ -265,13 +265,19 @@ public class BloodPressurePatientWorker implements Callable<List<QuanPatientsRes
                     if (StringUtils.isNotEmpty(srt)) {
                         BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
                         if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
-                            if("妊娠期高血压疾病（除外红、橙色）".equals(basicConfig.getName())
-                                    ||"妊娠期高血压".equals(basicConfig.getName())
-                                    ||"子痫前期（轻）".equals(basicConfig.getName())
-                                    ||"慢性高血压合并妊娠".equals(basicConfig.getName())
-                                    ||"妊娠期高血压性心脏病".equals(basicConfig.getName())
-                                    ||"急性肾脏疾病伴高血压".equals(basicConfig.getName())
-                                    ||"慢性肾脏疾病伴高血压".equals(basicConfig.getName())
+                            String name= basicConfig.getName();
+                            if("妊娠期高血压疾病（除外红、橙色）".equals(name)
+                                    ||"妊娠期高血压".equals(name)
+                                    ||"子痫前期（轻）".equals(name)
+                                    ||"慢性高血压合并妊娠".equals(name)
+                                    ||"妊娠期高血压性心脏病".equals(name)
+                                    ||"急性肾脏疾病伴高血压".equals(name)
+                                    ||"慢性肾脏疾病伴高血压".equals(name)
+                                    ||"妊娠期高血压疾病病史".equals(name)
+                                    ||"重度子痫前期".equals(name)
+                                    ||"慢性高血压合并子痫前期".equals(name)
+                                    //||"高血压（需要药物治疗）".equals(name)
+                                    ||"泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）".equals(name)
                             ){
                                 sb.append(basicConfig.getName()).append(',');
                             }