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 30f377b..8db4680 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 @@ -4,6 +4,7 @@ import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.platform.biz.SequenceConstant; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.constants.UnitConstants; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; @@ -2462,6 +2463,23 @@ public class AntenatalExaminationFacade { antExChuModel = antExChuModels.get(0); } if (null != antExChuModel) { + Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); + if(patients!=null){ + //月经周期 + String mensDay = ""; + if (patients.getMensEndDay() != null) { + mensDay = com.lyms.platform.common.utils.StringUtils.unitHandle(patients.getMensStartDay(), UnitConstants.DAY); + } + + if (patients.getMensEndDay() != null) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(mensDay)) { + mensDay += " - "; + } + mensDay += com.lyms.platform.common.utils.StringUtils.unitHandle(patients.getMensEndDay(), UnitConstants.DAY); + } + antexChuResult.setMensDay(mensDay); + } + antexChuResult.convertToResult(antExChuModel); try { if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 4fe87a0..1b49bf0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -154,6 +154,8 @@ public class AntexChuResult { private String cDueWeek; private String bg; + // 月经周期开始天数 + private String mensDay; /** * 初检信息 @@ -638,6 +640,14 @@ public class AntexChuResult { return edema; } + public String getMensDay() { + return mensDay; + } + + public void setMensDay(String mensDay) { + this.mensDay = mensDay; + } + public void setEdema(String edema) { this.edema = edema; }