diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index d02b753..f9d1f8a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -1435,6 +1435,9 @@ public class MaternalDeliverModel extends BaseModel { // 脐带异常类型 private String umbilicalCordExType; + // 脐带异常备注 + private String umbilicalCordExRemark; + /******威海妇幼新增字段******/ private String tpmcDate;//胎盘娩出时间 //娩出方式 @@ -1449,6 +1452,14 @@ public class MaternalDeliverModel extends BaseModel { private String placentalQs;//胎盘缺损g private String ccm;//粗糙面 + public String getUmbilicalCordExRemark() { + return umbilicalCordExRemark; + } + + public void setUmbilicalCordExRemark(String umbilicalCordExRemark) { + this.umbilicalCordExRemark = umbilicalCordExRemark; + } + public String getPlacentalComplete() { return placentalComplete; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index e22b6b8..58c3721 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -672,17 +672,20 @@ public class MatDeliverController extends BaseController{ map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(patients.getId()); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(antExChuModels)) - { - AntExChuModel antExChuModel = antExChuModels.get(0); - map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); - map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); - - } + map.put("yc",newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity()); + map.put("cc",newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount()); + +// AntExChuQuery antExChuQuery = new AntExChuQuery(); +// antExChuQuery.setYn(YnEnums.YES.getId()); +// antExChuQuery.setParentId(patients.getId()); +// List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); +// if (CollectionUtils.isNotEmpty(antExChuModels)) +// { +// AntExChuModel antExChuModel = antExChuModels.get(0); +// map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); +// map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); +// +// } map.put("ts",newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber()); if (StringUtils.isNotEmpty(patients.getFmHospital())) 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 f4a4626..88cf9ea 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 @@ -2337,6 +2337,9 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber()); + newBabyManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity()); + newBabyManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount()); + newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek()); for (SexEnum sexEnum : SexEnum.values()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4d37d21..a38f443 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2926,6 +2926,7 @@ public class ViewFacade { } extMap.put("umbilicalCordEx", umbilicalCordEx); extMap.put("umbilicalCordExType", umbilicalCordExType); + extMap.put("umbilicalCordExRemark", temp.getUmbilicalCordExRemark()); /******威海新增胎盘字段*******/ extMap.put("tpmcDate",temp.getTpmcDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index 99655be..09cf178 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java @@ -145,6 +145,26 @@ public class NewBabyManagerQueryModel { private String fmWeek; + //产次 + private Integer dueCount; + private Integer gravidity;//孕次 + + public Integer getDueCount() { + return dueCount; + } + + public void setDueCount(Integer dueCount) { + this.dueCount = dueCount; + } + + public Integer getGravidity() { + return gravidity; + } + + public void setGravidity(Integer gravidity) { + this.gravidity = gravidity; + } + public String getFmWeek() { return fmWeek; }