Commit b6f95ae10182d0fbafac57d9cb8154921db167df
1 parent
7f651cc172
Exists in
dev
#fix:优化出生证明
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
b6f95ae
| ... | ... | @@ -1974,7 +1974,8 @@ |
| 1974 | 1974 | String week = (patients.getFmWeek() / 7) + ""; |
| 1975 | 1975 | int day = (patients.getFmWeek() % 7); |
| 1976 | 1976 | dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); |
| 1977 | - babyWeek=DateUtil.getBabyMonthAge(patients.getFmDate(),new Date()); | |
| 1977 | + int babyDay=DateUtil.daysBetween(patients.getFmDate(),new Date()); | |
| 1978 | + babyWeek= babyDay/7 +""; | |
| 1978 | 1979 | } |
| 1979 | 1980 | birthResult.setDueWeek(dueWeek); |
| 1980 | 1981 | birthResult.setParentId(patients.getId()); |
| ... | ... | @@ -2026,7 +2027,8 @@ |
| 2026 | 2027 | String week = (patients.getFmWeek() / 7) + ""; |
| 2027 | 2028 | int day = (patients.getFmWeek() % 7); |
| 2028 | 2029 | dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); |
| 2029 | - babyWeek=DateUtil.getBabyMonthAge(patients.getFmDate(),new Date()); | |
| 2030 | + int babyDay=DateUtil.daysBetween(patients.getFmDate(),new Date()); | |
| 2031 | + babyWeek= babyDay/7 +""; | |
| 2030 | 2032 | } |
| 2031 | 2033 | birthResult.setDueWeek(dueWeek); |
| 2032 | 2034 |