Commit 4560eea3b289b1ac5d99ca9a58c261fc03a3e748
1 parent
ad758780d2
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 14 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
4560eea
| ... | ... | @@ -230,17 +230,22 @@ |
| 230 | 230 | bm.setMremark(b.getMremark()); |
| 231 | 231 | bm.setDiagnose(b.getDiagnose()); |
| 232 | 232 | |
| 233 | - if (b.getExpType() == ExpEnums.SGY.getId()) | |
| 233 | + if (b.getExpType() != null) | |
| 234 | 234 | { |
| 235 | - Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3); | |
| 236 | - bm.setVipEndTime(vipEndTime); | |
| 235 | + if (b.getExpType() == ExpEnums.SGY.getId()) | |
| 236 | + { | |
| 237 | + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3); | |
| 238 | + bm.setVipEndTime(vipEndTime); | |
| 239 | + } | |
| 240 | + else | |
| 241 | + { | |
| 242 | + Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3); | |
| 243 | + bm.setVipEndTime(vipEndTime); | |
| 244 | + } | |
| 245 | + bm.setExpType(b.getExpType()); | |
| 237 | 246 | } |
| 238 | - else | |
| 239 | - { | |
| 240 | - Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3); | |
| 241 | - bm.setVipEndTime(vipEndTime); | |
| 242 | - } | |
| 243 | 247 | |
| 248 | + | |
| 244 | 249 | bm.setServiceStatus(b.getServiceStatus()); |
| 245 | 250 | |
| 246 | 251 | bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); |
| ... | ... | @@ -254,7 +259,7 @@ |
| 254 | 259 | bm.setHospitalId(b.getHospitalId()); |
| 255 | 260 | bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); |
| 256 | 261 | |
| 257 | - bm.setExpType(b.getExpType()); | |
| 262 | + | |
| 258 | 263 | |
| 259 | 264 | bm.setCurrentHighRisk(b.getHighRisk()); |
| 260 | 265 |