Commit dd49a57149190817c3373b25b2b97b3d68c906af
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
View file @
dd49a57
| ... | ... | @@ -235,17 +235,23 @@ |
| 235 | 235 | |
| 236 | 236 | /** |
| 237 | 237 | * 返回孕周天数 |
| 238 | - * @param lastMenses | |
| 238 | + * @param start | |
| 239 | 239 | * @return |
| 240 | 240 | */ |
| 241 | - public static String getYunWeekDay(Date lastMenses) { | |
| 242 | - if (lastMenses == null) | |
| 241 | + public static String getYunWeekDay(Date start) { | |
| 242 | + if(start == null) { | |
| 243 | + return "孕0周+0天"; | |
| 244 | + } | |
| 245 | + String weekStr = ""; | |
| 246 | + Integer betweenDay = DateUtils.daysBetween(start, new Date()); | |
| 247 | + Integer week = betweenDay / 7; | |
| 248 | + Integer day = betweenDay % 7; | |
| 249 | + weekStr = "孕" + week + "周"; | |
| 250 | + if (day > 0) | |
| 243 | 251 | { |
| 244 | - return ""; | |
| 252 | + weekStr += day + "天"; | |
| 245 | 253 | } |
| 246 | - int day = DateUtils.daysBetween(lastMenses,new Date()); | |
| 247 | - | |
| 248 | - return day+"天"; | |
| 254 | + return weekStr; | |
| 249 | 255 | } |
| 250 | 256 | |
| 251 | 257 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
dd49a57
| ... | ... | @@ -924,7 +924,7 @@ |
| 924 | 924 | |
| 925 | 925 | |
| 926 | 926 | //短信前缀 |
| 927 | - String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor()); | |
| 927 | + String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, babyModel.getBuildDoctor(),ServiceObjEnums.YUNOBJ.getId()); | |
| 928 | 928 | for (SmsTemplateModel templateModel : sendList) { |
| 929 | 929 | if (templateModel != null && templateModel.getStatus() == 1) { |
| 930 | 930 | ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName()); |