Commit cbd98e5e5d918d347332e7aec6057d68260c5e71
1 parent
f07e62fe5b
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 15 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
cbd98e5
| ... | ... | @@ -363,17 +363,25 @@ |
| 363 | 363 | Patients patients = patientsService.findOnePatientById(record.getParentId()); |
| 364 | 364 | String dueWeek = ""; |
| 365 | 365 | if (null != patients) { |
| 366 | - if (patients.getDueStatus() != null && patients.getDueStatus() == 1 && patients.getType() == 3) { | |
| 367 | - dueWeek = "终止妊娠"; | |
| 368 | - } else if (patients.getType() == 3) { | |
| 369 | - dueWeek = "已分娩"; | |
| 370 | - } else { | |
| 371 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 366 | +// if (patients.getDueStatus() != null && patients.getDueStatus() == 1 && patients.getType() == 3) { | |
| 367 | +// dueWeek = "终止妊娠"; | |
| 368 | +// } else if (patients.getType() == 3) { | |
| 369 | +// dueWeek = "已分娩"; | |
| 370 | +// } else { | |
| 371 | +// int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 372 | +// String week = (days / 7) + ""; | |
| 373 | +// int day = (days % 7); | |
| 374 | +// dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 375 | +// } | |
| 376 | + //2017-03-15 高帆说的改成这样 | |
| 377 | + if (patients.getLastMenses() != null && record.getCheckTime() != null) | |
| 378 | + { | |
| 379 | + int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime()); | |
| 372 | 380 | String week = (days / 7) + ""; |
| 373 | 381 | int day = (days % 7); |
| 374 | 382 | dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); |
| 383 | + cjStatisticsListResult.setDueWeek(dueWeek); | |
| 375 | 384 | } |
| 376 | - cjStatisticsListResult.setDueWeek(dueWeek); | |
| 377 | 385 | } |
| 378 | 386 | |
| 379 | 387 |