diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 99a71dc..2327b7b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -63,6 +63,8 @@ public class PremaritalCheckup extends BaseModel { private String menarcheAge; //月经周期 private String menstrualCycle; + //月经经期 + private String menstrualDay; //月经量 private String menstrualAmount; //末次月经 @@ -589,6 +591,14 @@ public class PremaritalCheckup extends BaseModel { //B超检查号 private String lhbcjch; + public String getMenstrualDay() { + return menstrualDay; + } + + public void setMenstrualDay(String menstrualDay) { + this.menstrualDay = menstrualDay; + } + public String getLhbcms() { return lhbcms; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index b7cb328..635ee51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -729,7 +729,7 @@ public class PremaritalCheckupFacade { checkup.setCxNum(addRequest.getCxNum()); checkup.setJczt(addRequest.getJczt()); checkup.setFkjjState(addRequest.getFkjjState()); - + checkup.setMenstrualDay(addRequest.getMenstrualDay()); //血缘关系 checkup.setIsBloodshed(addRequest.getIsBloodshed()); //血缘详情 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 1d58d13..b793319 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -49,6 +49,8 @@ public class PremaritalCheckupAddRequest { private String menarcheAge; //月经周期 private String menstrualCycle; + //月经经期 + private String menstrualDay; //月经量 private String menstrualAmount; //末次月经 @@ -579,6 +581,15 @@ public class PremaritalCheckupAddRequest { //B超检查号 private String lhbcjch; + + public String getMenstrualDay() { + return menstrualDay; + } + + public void setMenstrualDay(String menstrualDay) { + this.menstrualDay = menstrualDay; + } + public String getLhbcms() { return lhbcms; } 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 990b3ca..217e9f1 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 @@ -889,17 +889,20 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen PreEugenicsBaseModel preEugenicsBaseModel = yjList.get(0); if(preEugenicsBaseModel.getWifeBaseInfo()!=null){ Map wifeBaseInfo = preEugenicsBaseModel.getWifeBaseInfo(); - if(wifeBaseInfo.containsKey("firstMensesAge")){ - map.put("menarcheAge", wifeBaseInfo.get("firstMensesAge")); + if(wifeBaseInfo.containsKey("menarcheAge")){ + map.put("menarcheAge", wifeBaseInfo.get("menarcheAge")); } if(wifeBaseInfo.containsKey("lastMenses")){ map.put("lastMenses", wifeBaseInfo.get("lastMenses")); } - if(wifeBaseInfo.containsKey("yjl")){ - map.put("menstrualAmount", wifeBaseInfo.get("yjl")); + if(wifeBaseInfo.containsKey("menstrualAmount")){ + map.put("menstrualAmount", wifeBaseInfo.get("menstrualAmount")); } - if(wifeBaseInfo.containsKey("tj")){ - map.put("menorrhalgia", wifeBaseInfo.get("tj")); + if(wifeBaseInfo.containsKey("menstrualCycle")){ + map.put("menstrualCycle", wifeBaseInfo.get("menstrualCycle")); + } + if(wifeBaseInfo.containsKey("menorrhalgia")){ + map.put("menorrhalgia", wifeBaseInfo.get("menorrhalgia")); } }