Commit be7224faf01e0fc0e8f412ea03592a3eee18f184
1 parent
44b83f378c
Exists in
master
and in
6 other branches
建档孕周
Showing 2 changed files with 29 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
be7224f
| ... | ... | @@ -2964,9 +2964,9 @@ |
| 2964 | 2964 | } |
| 2965 | 2965 | } |
| 2966 | 2966 | } |
| 2967 | - for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){ | |
| 2968 | - result.setCreatedWeek(result.getQqybuild()); | |
| 2969 | - } | |
| 2967 | +// for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){ | |
| 2968 | +// result.setCreatedWeek(result.getQqybuild()); | |
| 2969 | +// } | |
| 2970 | 2970 | childbirthManagerResult.setData(childbirthManagerQueryModelList); |
| 2971 | 2971 | childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 2972 | 2972 | childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
be7224f
| ... | ... | @@ -235,25 +235,41 @@ |
| 235 | 235 | |
| 236 | 236 | //建档孕周 |
| 237 | 237 | String dueWeek = ""; |
| 238 | +// try { | |
| 239 | +// if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 240 | +//// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 241 | +// dueWeek = "已分娩"; | |
| 242 | +// } else { | |
| 243 | +// int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); | |
| 244 | +// if (days > 7 * 42 - 1) { | |
| 245 | +// dueWeek = "已分娩"; | |
| 246 | +// } else { | |
| 247 | +// String week = (days / 7) + ""; | |
| 248 | +// int day = (days % 7); | |
| 249 | +// dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 250 | +// } | |
| 251 | +// } | |
| 252 | +// } catch (Exception e) { | |
| 253 | +// // 什么都不干 | |
| 254 | +// } | |
| 255 | +// String dueWeek = ""; | |
| 238 | 256 | try { |
| 239 | - if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 240 | -// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 257 | + // 徐倩说改的 | |
| 258 | + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); | |
| 259 | + if (days > 7 * 42 - 1) { | |
| 241 | 260 | dueWeek = "已分娩"; |
| 242 | 261 | } else { |
| 243 | - int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); | |
| 244 | - if (days > 7 * 42 - 1) { | |
| 245 | - dueWeek = "已分娩"; | |
| 246 | - } else { | |
| 247 | - String week = (days / 7) + ""; | |
| 248 | - int day = (days % 7); | |
| 249 | - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 250 | - } | |
| 262 | + String week = (days / 7) + ""; | |
| 263 | + int day = (days % 7); | |
| 264 | + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 251 | 265 | } |
| 266 | + | |
| 252 | 267 | } catch (Exception e) { |
| 253 | 268 | // 什么都不干 |
| 254 | 269 | } |
| 255 | 270 | childbirthManagerQueryModel.setBuildWeek(dueWeek); |
| 256 | 271 | childbirthManagerQueryModel.setQqybuild(dueWeek); |
| 272 | + childbirthManagerQueryModel.setCreatedWeek(dueWeek); | |
| 257 | 273 | |
| 258 | 274 | // 分娩日期 |
| 259 | 275 | childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); |