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 3db1074..0652fa3 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 @@ -2613,6 +2613,16 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek()); + + String handDueWeek = ""; + Map handDueWeekMap = maternalDeliverModel.getHandDueWeek(); + if (handDueWeekMap != null && handDueWeekMap.size() > 0) + { + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" ); + } + newBabyManagerQueryModel.setHandDueWeek(handDueWeek); + + for (SexEnum sexEnum : SexEnum.values()) { if (sexEnum.getId().equals(babyModel.getSex())) { newBabyManagerQueryModel.setSex(sexEnum.getText()); 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 0ad6d71..1a5dcf5 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 @@ -2956,7 +2956,16 @@ public class ViewFacade { map.put("deliveryDate", data.getDueDate()); map.put("dueWeek", data.getDueWeek()); - map.put("handDueWeek", data.getHandDueWeek()); + + + String handDueWeek = ""; + Map handDueWeekMap = data.getHandDueWeek(); + if (handDueWeekMap != null && handDueWeekMap.size() > 0) + { + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" ); + } + + map.put("handDueWeek", handDueWeek); String fmHospital = ""; String addressPrefix = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 044daad..a8ba9ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -432,6 +432,19 @@ public class ChildbirthManagerQueryModel { private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 + + + //手动分娩孕周 + private String handDueWeek; + + public String getHandDueWeek() { + return handDueWeek; + } + + public void setHandDueWeek(String handDueWeek) { + this.handDueWeek = handDueWeek; + } + public String getBabyQX() { return babyQX; } 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 a9ebddb3..5e7c2a6 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 @@ -156,6 +156,16 @@ public class NewBabyManagerQueryModel { //手术原因 private String operationCause; + //手动分娩孕周 + private String handDueWeek; + + public String getHandDueWeek() { + return handDueWeek; + } + + public void setHandDueWeek(String handDueWeek) { + this.handDueWeek = handDueWeek; + } public String getNoEphone() { return noEphone; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index 37e1292..230e224 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -83,6 +83,14 @@ public class MaterDeliverWorker implements Callable 0 ? "+" + day + "天" : "")); } + String handDueWeek = ""; + Map handDueWeekMap = maternalDeliverModel.getHandDueWeek(); + if (handDueWeekMap != null && handDueWeekMap.size() > 0) + { + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" ); + } + childbirthManagerQueryModel.setHandDueWeek(handDueWeek); + // 分娩孕周 // 分娩日期