Commit 0d10fb3075b3b4785dcfccbfc30d9d4df137c1a8
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
View file @
0d10fb3
| ... | ... | @@ -114,6 +114,16 @@ |
| 114 | 114 | return DateUtil.parseYMD(birthday); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | + | |
| 118 | + public static String emptyDeal(String str) | |
| 119 | + { | |
| 120 | + if (isEmpty(str)) | |
| 121 | + { | |
| 122 | + return "-"; | |
| 123 | + } | |
| 124 | + return str; | |
| 125 | + } | |
| 126 | + | |
| 117 | 127 | // public static void main(String[] arg) { |
| 118 | 128 | // System.out.print(encryPhone("18382670036")); |
| 119 | 129 | // } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
0d10fb3
| ... | ... | @@ -1191,15 +1191,15 @@ |
| 1191 | 1191 | } else { |
| 1192 | 1192 | result.setHighRisk("高危"); |
| 1193 | 1193 | } |
| 1194 | - result.setSex(SexEnum.getTextById(model.getSex())); | |
| 1195 | - result.setBabyName(model.getName()); | |
| 1196 | - result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); | |
| 1197 | - result.setMommyName(model.getMname()); | |
| 1198 | - result.setMommnyPhone(model.getMphone()); | |
| 1194 | + result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); | |
| 1195 | + result.setBabyName(StringUtils.emptyDeal(model.getName())); | |
| 1196 | + result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); | |
| 1197 | + result.setMommyName(StringUtils.emptyDeal(model.getMname())); | |
| 1198 | + result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone())); | |
| 1199 | 1199 | result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone())); |
| 1200 | 1200 | result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())); |
| 1201 | - result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); | |
| 1202 | - result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); | |
| 1201 | + result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); | |
| 1202 | + result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); | |
| 1203 | 1203 | result.setPatientId(model.getParentId()); |
| 1204 | 1204 | |
| 1205 | 1205 | String diagnose = ""; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
View file @
0d10fb3