Commit 559009f9846bcae0b9548d3615a791ee52e60e0f
1 parent
090fc00ccd
Exists in
master
and in
6 other branches
微量元素
Showing 1 changed file with 8 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java
View file @
559009f
| ... | ... | @@ -182,15 +182,16 @@ |
| 182 | 182 | |
| 183 | 183 | String nextCheckDate = ""; |
| 184 | 184 | String nextCheckWeek = ""; |
| 185 | + Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1); | |
| 185 | 186 | if (isNormal) { |
| 186 | 187 | if (week < 13) |
| 187 | 188 | { |
| 188 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13)); | |
| 189 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); | |
| 189 | 190 | nextCheckWeek = "孕13周前后"; |
| 190 | 191 | } |
| 191 | 192 | else if (week >= 13 && week < 28) |
| 192 | 193 | { |
| 193 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); | |
| 194 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); | |
| 194 | 195 | nextCheckWeek = "孕28周前后"; |
| 195 | 196 | } |
| 196 | 197 | } |
| 197 | 198 | |
| 198 | 199 | |
| 199 | 200 | |
| 200 | 201 | |
| ... | ... | @@ -198,27 +199,27 @@ |
| 198 | 199 | { |
| 199 | 200 | if (week < 8) |
| 200 | 201 | { |
| 201 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),8)); | |
| 202 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,8)); | |
| 202 | 203 | nextCheckWeek = "孕8周前后"; |
| 203 | 204 | } |
| 204 | 205 | else if (week >= 8 && week < 13) |
| 205 | 206 | { |
| 206 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13)); | |
| 207 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); | |
| 207 | 208 | nextCheckWeek = "孕13周前后"; |
| 208 | 209 | } |
| 209 | 210 | else if (week >= 13 && week < 20) |
| 210 | 211 | { |
| 211 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),20)); | |
| 212 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,20)); | |
| 212 | 213 | nextCheckWeek = "孕20周前后"; |
| 213 | 214 | } |
| 214 | 215 | else if (week >= 20 && week < 28) |
| 215 | 216 | { |
| 216 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); | |
| 217 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); | |
| 217 | 218 | nextCheckWeek = "孕28周前后"; |
| 218 | 219 | } |
| 219 | 220 | else if (week >= 28 && week < 36) |
| 220 | 221 | { |
| 221 | - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),36)); | |
| 222 | + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,36)); | |
| 222 | 223 | nextCheckWeek = "孕36周前后"; |
| 223 | 224 | } |
| 224 | 225 | } |