Commit fdab2a41dee3041abcf4a72be220496558c5d7b8
1 parent
d357491965
Exists in
master
and in
6 other branches
服务
Showing 1 changed file with 7 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
fdab2a4
| ... | ... | @@ -449,13 +449,13 @@ |
| 449 | 449 | endTime = DateUtil.addWeek(lastMenses, 42); |
| 450 | 450 | } |
| 451 | 451 | |
| 452 | - pser.setSerStartTime(startTime); | |
| 453 | - pser.setSerEndTime(endTime); | |
| 454 | - | |
| 455 | 452 | Integer startWeek = DateUtil.getWeek(lastMenses, startTime); |
| 456 | 453 | Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; |
| 457 | 454 | endWeek = endWeek > 42 ? 42 : endWeek; |
| 458 | 455 | |
| 456 | + pser.setSerStartTime(startTime); | |
| 457 | + pser.setSerEndTime(endTime); | |
| 458 | + | |
| 459 | 459 | pser.setSerStartWeek(startWeek); |
| 460 | 460 | pser.setSerEndWeek(endWeek); |
| 461 | 461 | } |
| 462 | 462 | |
| ... | ... | @@ -479,12 +479,13 @@ |
| 479 | 479 | } |
| 480 | 480 | Date startTime = pser.getSerStartTime(); |
| 481 | 481 | |
| 482 | - pser.setDocEndTime(endTime); | |
| 483 | - pser.setDocStartTime(startTime); | |
| 484 | - | |
| 485 | 482 | Integer startWeek = DateUtil.getWeek(lastMenses, startTime); |
| 486 | 483 | Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; |
| 487 | 484 | endWeek = endWeek > 42 ? 42 : endWeek; |
| 485 | + | |
| 486 | + pser.setDocEndTime(endTime); | |
| 487 | + pser.setDocStartTime(startTime); | |
| 488 | + | |
| 488 | 489 | pser.setDocStartWeek(startWeek); |
| 489 | 490 | pser.setDocEndWeek(endWeek); |
| 490 | 491 | } |