From 4560eea3b289b1ac5d99ca9a58c261fc03a3e748 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 1 Jul 2016 11:05:20 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyBookbuildingFacade.java | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index a573fec..c60c7d3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -230,17 +230,22 @@ public class BabyBookbuildingFacade { bm.setMremark(b.getMremark()); bm.setDiagnose(b.getDiagnose()); - if (b.getExpType() == ExpEnums.SGY.getId()) + if (b.getExpType() != null) { - Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3); - bm.setVipEndTime(vipEndTime); - } - else - { - Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3); - bm.setVipEndTime(vipEndTime); + if (b.getExpType() == ExpEnums.SGY.getId()) + { + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3); + bm.setVipEndTime(vipEndTime); + } + else + { + Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3); + bm.setVipEndTime(vipEndTime); + } + bm.setExpType(b.getExpType()); } + bm.setServiceStatus(b.getServiceStatus()); bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); @@ -254,7 +259,7 @@ public class BabyBookbuildingFacade { bm.setHospitalId(b.getHospitalId()); bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); - bm.setExpType(b.getExpType()); + bm.setCurrentHighRisk(b.getHighRisk()); -- 1.8.3.1