Commit 60ec60876e82988ba851a3e7e5f6db98a4aacd3d
1 parent
e9440551b4
Exists in
dev
产妇转诊
Showing 1 changed file with 17 additions and 23 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
60ec608
| ... | ... | @@ -17,10 +17,7 @@ |
| 17 | 17 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 18 | 18 | import com.lyms.platform.operate.web.utils.FunvCommonUtil; |
| 19 | 19 | import com.lyms.platform.permission.model.*; |
| 20 | -import com.lyms.platform.permission.service.AppointmentService; | |
| 21 | -import com.lyms.platform.permission.service.CouponService; | |
| 22 | -import com.lyms.platform.permission.service.OrganizationService; | |
| 23 | -import com.lyms.platform.permission.service.UsersService; | |
| 20 | +import com.lyms.platform.permission.service.*; | |
| 24 | 21 | import com.lyms.platform.pojo.*; |
| 25 | 22 | import com.lyms.platform.query.*; |
| 26 | 23 | import org.apache.commons.collections.CollectionUtils; |
| ... | ... | @@ -92,6 +89,9 @@ |
| 92 | 89 | @Autowired |
| 93 | 90 | private AppointmentService appointmentService; |
| 94 | 91 | |
| 92 | + @Autowired | |
| 93 | + private DepartmentsService departmentsService; | |
| 94 | + | |
| 95 | 95 | /* @Autowired |
| 96 | 96 | private CouponService couponService; |
| 97 | 97 | |
| ... | ... | @@ -525,6 +525,17 @@ |
| 525 | 525 | medicalRecordVo.setNeed("true"); |
| 526 | 526 | medicalRecordVo.setLimit(applyScreeningQueryRequest.getLimit()); |
| 527 | 527 | medicalRecordVo.setPage(applyScreeningQueryRequest.getPage()); |
| 528 | + Users serviceUsers = usersService.getUsers(userId); | |
| 529 | + if(serviceUsers != null){ | |
| 530 | + // 不是主任的就按当前账号医生分 | |
| 531 | + if(serviceUsers.getZhiChenId() != 4){ | |
| 532 | + Departments departments = departmentsService.getDepartments(serviceUsers.getDeptId()); | |
| 533 | + if(departments != null ){ | |
| 534 | + medicalRecordVo.setDepartment(departments.getName()); | |
| 535 | + } | |
| 536 | + } | |
| 537 | + } | |
| 538 | + | |
| 528 | 539 | if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getQueryNo())){ |
| 529 | 540 | medicalRecordVo.setCardNo(applyScreeningQueryRequest.getQueryNo()); |
| 530 | 541 | } |
| ... | ... | @@ -550,6 +561,7 @@ |
| 550 | 561 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 551 | 562 | if(CollectionUtils.isNotEmpty(patientsList)){ |
| 552 | 563 | Patients patients = patientsList.get(0); |
| 564 | + screeningOutResult.setPid(patients.getPid()); | |
| 553 | 565 | // 高危因素 |
| 554 | 566 | if(StringUtils.isNotEmpty(patients.getRiskLevelId())){ |
| 555 | 567 | List level = new ArrayList(); |
| 556 | 568 | |
| ... | ... | @@ -586,26 +598,8 @@ |
| 586 | 598 | screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); |
| 587 | 599 | screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor()); |
| 588 | 600 | screeningOutResult.setId(screeningModels.get(0).getId()); |
| 589 | - screeningOutResult.setPid(screeningModels.get(0).getPid()); | |
| 590 | - Users serviceUsers = usersService.getUsers(userId); | |
| 591 | - if(null != serviceUsers){ | |
| 592 | - // 不是主任的就按当前账号医生分 | |
| 593 | - if(serviceUsers.getZhiChenId() != 4){ | |
| 594 | - if(userId.toString().equals(screeningOutResult.getApplyDoctor())){ | |
| 595 | - data.add(screeningOutResult); | |
| 596 | - } | |
| 597 | - }else{ | |
| 598 | - // 是主任就全显示 | |
| 599 | - data.add(screeningOutResult); | |
| 600 | - } | |
| 601 | - // 医生名字 | |
| 602 | - screeningOutResult.setApplyDoctor(serviceUsers.getName()); | |
| 603 | - } | |
| 604 | 601 | } |
| 605 | - else{ | |
| 606 | - // 是主任就全显示 | |
| 607 | - data.add(screeningOutResult); | |
| 608 | - } | |
| 602 | + data.add(screeningOutResult); | |
| 609 | 603 | } |
| 610 | 604 | } |
| 611 | 605 | PageInfo pageInfo = new PageInfo(); |