Commit e625453d211bdda2480ab619fa2869e39310434d
1 parent
fdab2a41de
Exists in
master
and in
6 other branches
服务
Showing 1 changed file with 6 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
e625453
| ... | ... | @@ -433,7 +433,7 @@ |
| 433 | 433 | { |
| 434 | 434 | Date lastMenses = patients.getLastMenses(); |
| 435 | 435 | Integer serviceWeek = pser.getServiceWeek(); |
| 436 | - Integer doctorService = pser.getDoctorWeek(); | |
| 436 | + Integer doctorWeek = pser.getDoctorWeek(); | |
| 437 | 437 | if (pser.getId() != null) |
| 438 | 438 | { |
| 439 | 439 | if (serviceWeek != null) |
| 440 | 440 | |
| ... | ... | @@ -468,11 +468,11 @@ |
| 468 | 468 | } |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | - if (doctorService != null) | |
| 471 | + if (doctorWeek != null) | |
| 472 | 472 | { |
| 473 | 473 | if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) |
| 474 | 474 | { |
| 475 | - Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService); | |
| 475 | + Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorWeek); | |
| 476 | 476 | if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) |
| 477 | 477 | { |
| 478 | 478 | endTime = DateUtil.addWeek(lastMenses, 42); |
| ... | ... | @@ -480,7 +480,7 @@ |
| 480 | 480 | Date startTime = pser.getSerStartTime(); |
| 481 | 481 | |
| 482 | 482 | Integer startWeek = DateUtil.getWeek(lastMenses, startTime); |
| 483 | - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; | |
| 483 | + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorWeek; | |
| 484 | 484 | endWeek = endWeek > 42 ? 42 : endWeek; |
| 485 | 485 | |
| 486 | 486 | pser.setDocEndTime(endTime); |
| 487 | 487 | |
| 488 | 488 | |
| 489 | 489 | |
| ... | ... | @@ -492,15 +492,12 @@ |
| 492 | 492 | else |
| 493 | 493 | { |
| 494 | 494 | pser.setDocStartTime(new Date()); |
| 495 | - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); | |
| 495 | + pser.setDocEndTime(DateUtil.addWeek(new Date(), doctorWeek)); | |
| 496 | 496 | pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); |
| 497 | - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); | |
| 497 | + pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorWeek); | |
| 498 | 498 | } |
| 499 | 499 | } |
| 500 | - | |
| 501 | - | |
| 502 | 500 | } |
| 503 | - | |
| 504 | 501 | } |
| 505 | 502 | |
| 506 | 503 |