From fd93e14aada2efa3ce806db25240f223d700bdeb Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 19 Oct 2018 11:48:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/MatDeliverController.java | 3 ++- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 1 + .../platform/operate/web/result/NewBabyManagerQueryModel.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 3bf3513..fe8aa84 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 @@ -392,8 +392,9 @@ public class MatDeliverController extends BaseController{ AntExChuModel antExChuModel = antExChuModels.get(0); map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); - map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1()); + } + 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 a6c1231..2f3b82a 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 @@ -2555,6 +2555,7 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid()); newBabyManagerQueryModel.setBabyWeight(StringUtils.isEmpty(babyModel.getBabyWeight()) ? "-" : String.valueOf(Double.valueOf(babyModel.getBabyWeight()) * 1000)); + newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber()); 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 5c13d5d..fdf14ec 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 @@ -141,6 +141,16 @@ public class NewBabyManagerQueryModel { //畸形 0非畸形 1畸形 private Integer deformity; + private Integer tireNumber; + + public Integer getTireNumber() { + return tireNumber; + } + + public void setTireNumber(Integer tireNumber) { + this.tireNumber = tireNumber; + } + public String getFmDate() { return fmDate; } -- 1.8.3.1