diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 3f9ac82..83f8172 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -883,6 +883,12 @@ public class MatDeliverFacade { antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(patients.getId()); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); try { String tTireNumber = ""; @@ -892,15 +898,17 @@ public class MatDeliverFacade { tTireNumber = examinationModel.get(0).getTireNumber(); } } else { - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(patients.getId()); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { tTireNumber = antExChuModels.get(0).getTireNumber(); } } + if (CollectionUtils.isNotEmpty(antExChuModels)) { + matDeliverListResult.setDueCount(antExChuModels.get(0).getProdTime() == null ? 1 : antExChuModels.get(0).getProdTime()+1); + }else{ + matDeliverListResult.setDueCount(1); + } + matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk()); matDeliverListResult.setRiskScore(highScoreResult.getScoreStr()); matDeliverListResult.setTireNumber1(tTireNumber); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 3f0909f..34cb4fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.Patients; -import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; import java.util.Date; @@ -48,6 +47,9 @@ public class MatDeliverListResult { // 胎数 private String tireNumber1; + // 产次 + private Integer dueCount; + private String status="0"; //分娩时间,补录时使用 @@ -58,6 +60,14 @@ public class MatDeliverListResult { private String cardNo; private String vcCardNo; + public Integer getDueCount() { + return dueCount; + } + + public void setDueCount(Integer dueCount) { + this.dueCount = dueCount; + } + public String getVcCardNo() { return vcCardNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index 34ae769..86292e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -22,6 +22,8 @@ public class MaternalDeliverResult { private String dueDate; //分娩孕周 private String dueWeek; + // 产次 + private Integer dueCount; //台数 private Integer tireNumber; //胎盘 @@ -84,11 +86,20 @@ public class MaternalDeliverResult { return deathCauseText; } + public Integer getDueCount() { + return dueCount; + } + + public void setDueCount(Integer dueCount) { + this.dueCount = dueCount; + } + public void setDeathCauseText(String deathCauseText) { this.deathCauseText = deathCauseText; } public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) { + setDueCount(destModel.getDueCount()); setFmAddr(destModel.getFmAddr()); setFmType(destModel.getFmType()); setId(destModel.getId());