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 9d783dd..456be56 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
@@ -3511,10 +3511,10 @@ public class AntenatalExaminationFacade {
                 Map map = antExcAddRequest.getFksxHistory();
                 if ("yes".equals(map.get("yesOrNo")))
                 {
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                     //异位妊娠手术
                     if ("true".equals(map.get("ywrsss")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YWRSSS.getId()).equals(item.getValueOne())
@@ -3528,7 +3528,6 @@ public class AntenatalExaminationFacade {
                     //子宫肌瘤剥除
                     if ("true".equals(map.get("zgjlbc")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.ZGJLXC.getId()).equals(item.getValueOne())
@@ -3542,7 +3541,6 @@ public class AntenatalExaminationFacade {
                     //剖宫产
                     if ("true".equals(map.get("pgc")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.PGC.getId()).equals(item.getValueOne())
@@ -3559,7 +3557,6 @@ public class AntenatalExaminationFacade {
                         String qtText = String.valueOf(map.get("qtText"));
                         if (StringUtils.isNotEmpty(qtText))
                         {
-                            List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                             if (CollectionUtils.isNotEmpty(items)) {
                                 for (DiagnoseItemModel item : items) {
                                     if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FKSSSQT.getId()).equals(item.getValueOne())
@@ -3573,9 +3570,6 @@ public class AntenatalExaminationFacade {
                 }
             }
 
-
-
-
             if (antExcAddRequest.getInfectDiseases() != null && antExcAddRequest.getInfectDiseases().size() > 0)
             {
                 //传染病史
@@ -3583,10 +3577,11 @@ public class AntenatalExaminationFacade {
                 if ("yes".equals(map.get("yesOrNo")))
                 {
 
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.crbs.getId());
+
                     //乙肝
                     if ("true".equals(map.get("yg")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.crbs.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YG.getId()).equals(item.getValueOne())
@@ -3600,7 +3595,6 @@ public class AntenatalExaminationFacade {
                     //丙肝
                     if ("true".equals(map.get("bg")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.crbs.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.BG.getId()).equals(item.getValueOne())
@@ -3614,7 +3608,6 @@ public class AntenatalExaminationFacade {
                     //艾滋
                     if ("true".equals(map.get("azb")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.AZ.getId()).equals(item.getValueOne())
@@ -3628,7 +3621,6 @@ public class AntenatalExaminationFacade {
                     //梅毒
                     if ("true".equals(map.get("md")))
                     {
-                        List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                         if (CollectionUtils.isNotEmpty(items)) {
                             for (DiagnoseItemModel item : items) {
                                 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.MD.getId()).equals(item.getValueOne())
@@ -3645,7 +3637,6 @@ public class AntenatalExaminationFacade {
                         String qtText = String.valueOf(map.get("qtText"));
                         if (StringUtils.isNotEmpty(qtText))
                         {
-                            List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
                             if (CollectionUtils.isNotEmpty(items)) {
                                 for (DiagnoseItemModel item : items) {
                                     if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.CRBSQT.getId()).equals(item.getValueOne())
@@ -3704,10 +3695,91 @@ public class AntenatalExaminationFacade {
                                 CollectionUtils.isNotEmpty(item.getRiskIds())) {
                             list.addAll(item.getRiskIds());
                         }
+                        else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne())
+                                && String.valueOf(DiagnoseEnums.JwsChildEnums.B.getId()).equals(item.getValueTwo()) &&
+                                CollectionUtils.isNotEmpty(item.getRiskIds()))
+                        {
+                            list.addAll(item.getRiskIds());
+                        }
+                        else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne())
+                                && String.valueOf(DiagnoseEnums.JwsChildEnums.C.getId()).equals(item.getValueTwo()) &&
+                                CollectionUtils.isNotEmpty(item.getRiskIds()))
+                        {
+                            list.addAll(item.getRiskIds());
+                        }
+                        else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne())
+                                && String.valueOf(DiagnoseEnums.JwsChildEnums.D.getId()).equals(item.getValueTwo()) &&
+                                CollectionUtils.isNotEmpty(item.getRiskIds()))
+                        {
+                            list.addAll(item.getRiskIds());
+                        }
+                    }
+                }
+            }
+
+            if (StringUtils.isNotEmpty(antExcAddRequest.getTireNumber()) && StringUtils.isNotEmpty(antExcAddRequest.getQuickenRemark())) {
+
+                // 产科检查
+                List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
+
+                if ("2".equals(antExcAddRequest.getTireNumber()))
+                {
+                    //胎数=双胎
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.TSEST.getId()).equals(item.getValueOne())
+                                &&  contain(item.getValueTwo(),antExcAddRequest.getQuickenRemark())  &&
+                                CollectionUtils.isNotEmpty(item.getRiskIds()))
+                            {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
+                //胎数>双胎
+                else if (2 < Integer.parseInt(antExcAddRequest.getTireNumber()))
+                {
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.TSLYST.getId()).equals(item.getValueOne())
+                                    &&  contain(item.getValueTwo(),antExcAddRequest.getQuickenRemark())  &&
+                                    CollectionUtils.isNotEmpty(item.getRiskIds()))
+                            {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
                     }
                 }
             }
 
+            if (antExcAddRequest.getPastHistory() != null && antExcAddRequest.getPastHistory().size() > 0) {
+                //既往史
+                Map map = antExcAddRequest.getPastHistory();
+                if ("yes".equals(map.get("yesOrNo"))) {
+
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.jws.getId());
+                    //循环系统类
+                    if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null)
+                    {
+                        Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3");
+                        if (map1 != null)
+                        {
+                            String checkBox = String.valueOf(map1.get("checkBox"));
+                            List<String> selecteds = (List<String>)map1.get("selected");
+                            if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds))
+                            {
+                                for (String key : selecteds)
+                                {
+                                    if ("".equals(key))
+                                    {
+
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
 
         }