From fe52fcb67d10ec71712f78f8a4ae615483591e3d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 10 Aug 2016 14:54:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/StringUtils.java | 10 ++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 14 +++++++------- .../platform/operate/web/facade/StopPregnancyFacade.java | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index b5c6998..59fc6cc 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -114,6 +114,16 @@ public final class StringUtils { return DateUtil.parseYMD(birthday); } + + public static String emptyDeal(String str) + { + if (isEmpty(str)) + { + return "-"; + } + return str; + } + // public static void main(String[] arg) { // System.out.print(encryPhone("18382670036")); // } 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 dd37c3b..e9439e9 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 @@ -1191,15 +1191,15 @@ public class BabyBookbuildingFacade { } else { result.setHighRisk("高危"); } - result.setSex(SexEnum.getTextById(model.getSex())); - result.setBabyName(model.getName()); - result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); - result.setMommyName(model.getMname()); - result.setMommnyPhone(model.getMphone()); + result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); + result.setBabyName(StringUtils.emptyDeal(model.getName())); + result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); + result.setMommyName(StringUtils.emptyDeal(model.getMname())); + result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone())); result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone())); result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())); - result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); - result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); + result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); result.setPatientId(model.getParentId()); String diagnose = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 0ee5b7a..ffbd38b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -101,6 +101,7 @@ public class StopPregnancyFacade { patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); } patient.setDueDate(new Date()); + patient.setType(3); //分娩状态 0未终止妊娠 1终止妊娠 yunBookbuildingService.updatePregnant(patient, request.getPid()); -- 1.8.3.1