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 fe8aa84..ad6c5f5 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 @@ -429,7 +429,7 @@ public class MatDeliverController extends BaseController{ header.put("cc","产次"); header.put("ts","胎数"); header.put("dueType", "分娩方式"); - header.put("dueWeek", "分娩孕周"); + header.put("fmWeek", "分娩孕周"); header.put("jx", "外观是否正常"); header.put("deliverDoctor", "接生医生"); header.put("birthDays", "出生天数"); 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 2f3b82a..02ddfc9 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 @@ -2469,7 +2469,6 @@ public class MatDeliverFacade { babyModelQuery.setBuildType(2); babyModelQuery.setOrder("birth"); - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModelList)) { newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo()); @@ -2520,6 +2519,7 @@ public class MatDeliverFacade { } BeanUtils.copy(babyModel, newBabyManagerQueryModel); + String apgarScorePf1 = ""; String apgarScorePf5 = ""; String apgarScorePf10 = ""; @@ -2556,6 +2556,9 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setBabyWeight(StringUtils.isEmpty(babyModel.getBabyWeight()) ? "-" : String.valueOf(Double.valueOf(babyModel.getBabyWeight()) * 1000)); newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber()); + + + newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek()); 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/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index fdf14ec..99655be 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 @@ -143,6 +143,16 @@ public class NewBabyManagerQueryModel { private Integer tireNumber; + private String fmWeek; + + public String getFmWeek() { + return fmWeek; + } + + public void setFmWeek(String fmWeek) { + this.fmWeek = fmWeek; + } + public Integer getTireNumber() { return tireNumber; }