Commit f5b5077fc1d4d79bb4b3346d0a07fa8beb56e588
1 parent
c783cf260c
Exists in
master
and in
6 other branches
服务
Showing 2 changed files with 23 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
f5b5077
| ... | ... | @@ -312,7 +312,7 @@ |
| 312 | 312 | |
| 313 | 313 | |
| 314 | 314 | Patients patients = patientsService.findOnePatientById(ps.getParentid()); |
| 315 | - setServiceRecord(pser, patients); | |
| 315 | + setServiceRecordAdd(pser, patients); | |
| 316 | 316 | |
| 317 | 317 | patientServiceService.addPatientService(pser); |
| 318 | 318 | |
| 319 | 319 | |
| ... | ... | @@ -372,11 +372,30 @@ |
| 372 | 372 | return baseResponse; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - public void setServiceRecord(PatientService pser, Patients patients) | |
| 375 | + public void setServiceRecordAdd(PatientService pser, Patients patients) | |
| 376 | 376 | { |
| 377 | 377 | Date lastMenses = patients.getLastMenses(); |
| 378 | 378 | Integer serviceWeek = pser.getServiceWeek(); |
| 379 | 379 | Integer doctorService = pser.getDoctorWeek(); |
| 380 | + | |
| 381 | + pser.setSerStartTime(new Date()); | |
| 382 | + pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek)); | |
| 383 | + pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date())); | |
| 384 | + pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek); | |
| 385 | + | |
| 386 | + pser.setDocStartTime(new Date()); | |
| 387 | + pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); | |
| 388 | + pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); | |
| 389 | + pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); | |
| 390 | + | |
| 391 | + } | |
| 392 | + | |
| 393 | + | |
| 394 | + public void setServiceRecordUpdate(PatientService pser, Patients patients) | |
| 395 | + { | |
| 396 | + Date lastMenses = patients.getLastMenses(); | |
| 397 | + Integer serviceWeek = pser.getServiceWeek(); | |
| 398 | + Integer doctorService = pser.getDoctorWeek(); | |
| 380 | 399 | if (pser.getId() != null) |
| 381 | 400 | { |
| 382 | 401 | if (pser.getSerEndTime().getTime() > new Date().getTime()) |
| ... | ... | @@ -421,18 +440,6 @@ |
| 421 | 440 | pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); |
| 422 | 441 | pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); |
| 423 | 442 | } |
| 424 | - } | |
| 425 | - else | |
| 426 | - { | |
| 427 | - pser.setSerStartTime(new Date()); | |
| 428 | - pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek)); | |
| 429 | - pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date())); | |
| 430 | - pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek); | |
| 431 | - | |
| 432 | - pser.setDocStartTime(new Date()); | |
| 433 | - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); | |
| 434 | - pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); | |
| 435 | - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); | |
| 436 | 443 | } |
| 437 | 444 | |
| 438 | 445 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
View file @
f5b5077
| ... | ... | @@ -110,7 +110,7 @@ |
| 110 | 110 | //操作时间 |
| 111 | 111 | ps.setUpdateDate(new Date()); |
| 112 | 112 | |
| 113 | - patientServiceFacade.setServiceRecord(ps, patients); | |
| 113 | + patientServiceFacade.setServiceRecordUpdate(ps, patients); | |
| 114 | 114 | |
| 115 | 115 | patientServiceService.updatePatientService(ps); |
| 116 | 116 | } else {//新增 |
| ... | ... | @@ -126,7 +126,7 @@ |
| 126 | 126 | patientService.setStatus(1); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - patientServiceFacade.setServiceRecord(patientService,patients); | |
| 129 | + patientServiceFacade.setServiceRecordAdd(patientService,patients); | |
| 130 | 130 | |
| 131 | 131 | patientServiceService.addPatientService(patientService); |
| 132 | 132 | } |