Commit 26e26160acedb69b896c752e8672c1d310d3a483
1 parent
a70c0cb388
Exists in
master
and in
6 other branches
首诊打印增加月经周期
Showing 2 changed files with 28 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
26e2616
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.lyms.platform.biz.SequenceConstant; |
| 5 | 5 | import com.lyms.platform.biz.service.*; |
| 6 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 7 | +import com.lyms.platform.common.constants.UnitConstants; | |
| 7 | 8 | import com.lyms.platform.common.dao.operator.MongoQuery; |
| 8 | 9 | import com.lyms.platform.common.enums.*; |
| 9 | 10 | import com.lyms.platform.common.result.BaseObjectResponse; |
| ... | ... | @@ -2462,6 +2463,23 @@ |
| 2462 | 2463 | antExChuModel = antExChuModels.get(0); |
| 2463 | 2464 | } |
| 2464 | 2465 | if (null != antExChuModel) { |
| 2466 | + Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); | |
| 2467 | + if(patients!=null){ | |
| 2468 | + //月经周期 | |
| 2469 | + String mensDay = ""; | |
| 2470 | + if (patients.getMensEndDay() != null) { | |
| 2471 | + mensDay = com.lyms.platform.common.utils.StringUtils.unitHandle(patients.getMensStartDay(), UnitConstants.DAY); | |
| 2472 | + } | |
| 2473 | + | |
| 2474 | + if (patients.getMensEndDay() != null) { | |
| 2475 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(mensDay)) { | |
| 2476 | + mensDay += " - "; | |
| 2477 | + } | |
| 2478 | + mensDay += com.lyms.platform.common.utils.StringUtils.unitHandle(patients.getMensEndDay(), UnitConstants.DAY); | |
| 2479 | + } | |
| 2480 | + antexChuResult.setMensDay(mensDay); | |
| 2481 | + } | |
| 2482 | + | |
| 2465 | 2483 | antexChuResult.convertToResult(antExChuModel); |
| 2466 | 2484 | try { |
| 2467 | 2485 | if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
View file @
26e2616
| ... | ... | @@ -154,6 +154,8 @@ |
| 154 | 154 | |
| 155 | 155 | private String cDueWeek; |
| 156 | 156 | private String bg; |
| 157 | + // 月经周期开始天数 | |
| 158 | + private String mensDay; | |
| 157 | 159 | |
| 158 | 160 | /** |
| 159 | 161 | * 初检信息 |
| ... | ... | @@ -636,6 +638,14 @@ |
| 636 | 638 | |
| 637 | 639 | public String getEdema() { |
| 638 | 640 | return edema; |
| 641 | + } | |
| 642 | + | |
| 643 | + public String getMensDay() { | |
| 644 | + return mensDay; | |
| 645 | + } | |
| 646 | + | |
| 647 | + public void setMensDay(String mensDay) { | |
| 648 | + this.mensDay = mensDay; | |
| 639 | 649 | } |
| 640 | 650 | |
| 641 | 651 | public void setEdema(String edema) { |