diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 5b19786..c0c6738 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1479,7 +1479,9 @@ public class DateUtil {
 //        Date baby = parseDate("2018-02-01");
 //        int weeks = daysBetween(baby, new Date()) / 7;
 //        String weekAge = String.valueOf(weeks);
-//        System.out.print(weekAge);
+
+        Date baby = parseDate("2018-04-07");
+        System.out.println(baby.getTime());
     }
 
 }
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 015884c..6e10554 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
@@ -335,6 +335,18 @@ public class AntenatalExaminationFacade {
                 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊");
             }
 
+
+
+            //修改申请单状态
+            updateApplyOrder(model, antExAddRequest.getParentId());
+
+            final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
+            model.setPid(patients.getPid());
+
+            antenatalExaminationService.addOneBabyAnt(model);
+
+
+
             /** 验证产检券是否可用 可用就改为已使用状态 */
             if (StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) {
                 BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
@@ -345,13 +357,6 @@ public class AntenatalExaminationFacade {
                 }
             }
 
-            //修改申请单状态
-            updateApplyOrder(model, antExAddRequest.getParentId());
-
-            final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
-            model.setPid(patients.getPid());
-
-            antenatalExaminationService.addOneBabyAnt(model);
 
             final String antId = model.getId();
 
@@ -3428,17 +3433,286 @@ public class AntenatalExaminationFacade {
             }
 
 
+            if (StringUtils.isNotEmpty(antExcAddRequest.getSyjg()) && StringUtils.isNotEmpty(antExcAddRequest.getSyjgSelect()))
+            {
+                if ("yang".equals(antExcAddRequest.getSyjg()) && "2".equals(antExcAddRequest.getSyjgSelect())) {
+                    //  辅助检查——梅毒血清实验
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        //实验结果——阳性（+）已确诊
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SYJGYXYQZ.getId()).equals(item.getValueOne())
+                                    && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
+            }
 
 
-        }
+            if (StringUtils.isNotEmpty(antExcAddRequest.getSyjg()) && StringUtils.isNotEmpty(antExcAddRequest.getSyjgSelect()))
+            {
+                if ("yang".equals(antExcAddRequest.getSyjg()) && "1".equals(antExcAddRequest.getSyjgSelect())) {
+                    //  辅助检查——梅毒血清实验
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        //实验结果——阳性（+）初诊结果
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SYJGYXCZJG.getId()).equals(item.getValueOne())
+                                    && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
+            }
+
 
+            if (StringUtils.isNotEmpty(antExcAddRequest.getHivkt()) && StringUtils.isNotEmpty(antExcAddRequest.getHivktSelect()))
+            {
+                if ("yang".equals(antExcAddRequest.getHivkt()) && "2".equals(antExcAddRequest.getHivktSelect())) {
+                    //  辅助检查——梅毒血清实验
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        //HIV抗体检测——阳性（+）已确诊
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.HIVYQZ.getId()).equals(item.getValueOne())
+                                    && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
+            }
 
 
+            if (StringUtils.isNotEmpty(antExcAddRequest.getHivkt()) && StringUtils.isNotEmpty(antExcAddRequest.getHivktSelect()))
+            {
+                if ("yang".equals(antExcAddRequest.getHivkt()) && "1".equals(antExcAddRequest.getHivktSelect())) {
+                    //  辅助检查——梅毒血清实验
+                    List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
+                    if (CollectionUtils.isNotEmpty(items)) {
+                        //HIV抗体检测——阳性（+）初诊结果
+                        for (DiagnoseItemModel item : items) {
+                            if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.HIVCZJG.getId()).equals(item.getValueOne())
+                                    && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                list.addAll(item.getRiskIds());
+                            }
+                        }
+                    }
+                }
+            }
 
 
+            if (antExcAddRequest.getFksxHistory() != null && antExcAddRequest.getFksxHistory().size() > 0)
+            {
+                //妇科手术史（盆腔手术史）
+                Map map = antExcAddRequest.getFksxHistory();
+                if ("yes".equals(map.get("yesOrNo")))
+                {
+                    //异位妊娠手术
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //子宫肌瘤剥除
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //剖宫产
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
 
+                    //其他
+                    if ("true".equals(map.get("qt")) &&  map.get("qtText") != null)
+                    {
+                        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())
+                                           && contain(item.getValueTwo(),qtText) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                        list.addAll(item.getRiskIds());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+
+
+            if (antExcAddRequest.getInfectDiseases() != null && antExcAddRequest.getInfectDiseases().size() > 0)
+            {
+                //传染病史
+                Map map = antExcAddRequest.getInfectDiseases();
+                if ("yes".equals(map.get("yesOrNo")))
+                {
+
+                    //乙肝
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //丙肝
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //艾滋
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //梅毒
+                    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())
+                                        && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                    list.addAll(item.getRiskIds());
+                                }
+                            }
+                        }
+                    }
+
+                    //其他
+                    if ("true".equals(map.get("qt")) &&  map.get("qtText") != null)
+                    {
+                        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())
+                                            && contain(item.getValueTwo(),qtText) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                                        list.addAll(item.getRiskIds());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            if (StringUtils.isNotEmpty(antExcAddRequest.getGonggao()))
+            {
+                // 产科检查
+                List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
+                if (CollectionUtils.isNotEmpty(items)) {
+                    //宫高
+                    for (DiagnoseItemModel item : items) {
+                        if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.GG.getId()).equals(item.getValueOne())
+                                && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getGonggao()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                            list.addAll(item.getRiskIds());
+                        }
+                    }
+                }
+            }
+
+
+            if (StringUtils.isNotEmpty(antExcAddRequest.getFuwei()))
+            {
+                // 产科检查
+                List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
+                if (CollectionUtils.isNotEmpty(items)) {
+                    //腹围
+                    for (DiagnoseItemModel item : items) {
+                        if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FW.getId()).equals(item.getValueOne())
+                                && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getFuwei()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                            list.addAll(item.getRiskIds());
+                        }
+                    }
+                }
+            }
+
+
+            if (StringUtils.isNotEmpty(antExcAddRequest.getEdema()))
+            {
+                // 产科检查
+                List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
+                if (CollectionUtils.isNotEmpty(items)) {
+                    //浮肿
+                    for (DiagnoseItemModel item : items) {
+                        if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne())
+                                && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) &&
+                                CollectionUtils.isNotEmpty(item.getRiskIds())) {
+                            list.addAll(item.getRiskIds());
+                        }
+                    }
+                }
+            }
+
+
+
+        }
 
-    List<Map<String,String>> riskList = diagnoseConfigFacde.getRiskName(list);
+        List<Map<String,String>> riskList = diagnoseConfigFacde.getRiskName(list);
 
         return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }