diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index ebda9c9..bf02ba5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -651,14 +651,36 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
         List <PremaritalCheckup> hjList = premaritalCheckupService.queryPremaritalCheckup(query);
         if(CollectionUtils.isNotEmpty(hjList)){
             PremaritalCheckup premaritalCheckup = hjList.get(0);
-            map.put("menarcheAge", premaritalCheckup.getMenarcheAge());
+            map.put("menarcheAge", premaritalCheckup.getMenarcheAge());//初潮年龄
             map.put("lastMenses", premaritalCheckup.getLastMenses());
+            map.put("menstrualAmount", premaritalCheckup.getMenstrualAmount());//月经量
+            map.put("menorrhalgia", premaritalCheckup.getMenorrhalgia()); //痛经(1:有 2:无)（1:无 2:轻 3:中 4:重）
         }else {
             //孕检
             Query yquery = new Query();
             yquery.addCriteria(Criteria.where("hospitalId").is(hospitalId));
             yquery.addCriteria(Criteria.where("wifeCardNo").is(cardNo));
             List <PreEugenicsBaseModel> yjList = mongoTemplate.find(yquery, PreEugenicsBaseModel.class);
+            if(CollectionUtils.isNotEmpty(yjList)){
+                PreEugenicsBaseModel preEugenicsBaseModel = yjList.get(0);
+                if(preEugenicsBaseModel.getWifeBaseInfo()!=null){
+                    Map <String, Object> wifeBaseInfo = preEugenicsBaseModel.getWifeBaseInfo();
+                    if(wifeBaseInfo.containsKey("firstMensesAge")){
+                        map.put("menarcheAge", wifeBaseInfo.get("firstMensesAge"));
+                    }
+                    if(wifeBaseInfo.containsKey("lastMenses")){
+                        map.put("lastMenses", wifeBaseInfo.get("lastMenses"));
+                    }
+                    if(wifeBaseInfo.containsKey("yjl")){
+                        map.put("menstrualAmount", wifeBaseInfo.get("yjl"));
+                    }
+                    if(wifeBaseInfo.containsKey("tj")){
+                        map.put("menorrhalgia", wifeBaseInfo.get("tj"));
+                    }
+                }
+
+            }
+            
         }
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
     }