Commit bf4f236238dff5d7905885737c753eef7c946aa7
1 parent
aa10634aad
Exists in
dev
产妇转诊
Showing 2 changed files with 30 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java
View file @
bf4f236
| ... | ... | @@ -63,8 +63,10 @@ |
| 63 | 63 | */ |
| 64 | 64 | @RequestMapping(method = RequestMethod.GET, value = "/queryMedicalRecord") |
| 65 | 65 | @ResponseBody |
| 66 | - public BaseResponse queryMedicalRecord(@Valid ApplyScreeningQueryRequest screeningQueryRequest) { | |
| 67 | - return applyScreeningFacade.queryMedicalRecord(screeningQueryRequest); | |
| 66 | + @TokenRequired | |
| 67 | + public BaseResponse queryMedicalRecord(@Valid ApplyScreeningQueryRequest screeningQueryRequest, HttpServletRequest request) { | |
| 68 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 69 | + return applyScreeningFacade.queryMedicalRecord(screeningQueryRequest,loginState.getId()); | |
| 68 | 70 | } |
| 69 | 71 | |
| 70 | 72 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
bf4f236
| ... | ... | @@ -519,15 +519,19 @@ |
| 519 | 519 | return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyScreeningQuery.getPageInfo()); |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | - public BaseListResponse queryMedicalRecord(ApplyScreeningQueryRequest applyScreeningQueryRequest) { | |
| 522 | + public BaseListResponse queryMedicalRecord(ApplyScreeningQueryRequest applyScreeningQueryRequest,Integer userId) { | |
| 523 | 523 | List<ApplyScreeningOutResult> data = new ArrayList(); |
| 524 | 524 | MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); |
| 525 | 525 | medicalRecordVo.setNeed("true"); |
| 526 | 526 | medicalRecordVo.setLimit(applyScreeningQueryRequest.getLimit()); |
| 527 | 527 | medicalRecordVo.setPage(applyScreeningQueryRequest.getPage()); |
| 528 | + if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getCardNo())){ | |
| 529 | + medicalRecordVo.setCardNo(applyScreeningQueryRequest.getCardNo()); | |
| 530 | + } | |
| 528 | 531 | List<MedicalRecordVo> medicalRecordVoList = appointmentService.queryList(medicalRecordVo); |
| 529 | 532 | if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ |
| 530 | 533 | for (MedicalRecordVo recordVo : medicalRecordVoList) { |
| 534 | + Boolean ckFlag = true; // 判断是否为产科 | |
| 531 | 535 | ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult(); |
| 532 | 536 | screeningOutResult.setName(recordVo.getName()); |
| 533 | 537 | String age1 = recordVo.getAge().substring(0,8); |
| 534 | 538 | |
| ... | ... | @@ -535,8 +539,13 @@ |
| 535 | 539 | int age = DateUtil.getYearSpace(new Date(),date); |
| 536 | 540 | screeningOutResult.setAge(String.valueOf(age)); |
| 537 | 541 | screeningOutResult.setCardNo(recordVo.getCardNo()); |
| 538 | - screeningOutResult.setDueWeek(recordVo.getDeliveryTime()); | |
| 542 | + screeningOutResult.setDueDate(recordVo.getDeliveryTime()); | |
| 539 | 543 | screeningOutResult.setPhone(recordVo.getPhone()); |
| 544 | + if(recordVo.getDepartment().contains("产科")){ | |
| 545 | + ckFlag = true; | |
| 546 | + }else{ | |
| 547 | + ckFlag = false; | |
| 548 | + } | |
| 540 | 549 | // 查建档 |
| 541 | 550 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 542 | 551 | patientsQuery.setCardNo(recordVo.getCardNo()); |
| 543 | 552 | |
| 544 | 553 | |
| ... | ... | @@ -573,14 +582,26 @@ |
| 573 | 582 | applyScreeningService.queryReferralApplyScreeningWithQuery(query); |
| 574 | 583 | if (CollectionUtils.isNotEmpty(screeningModels)){ |
| 575 | 584 | screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment()); |
| 585 | + screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment()); | |
| 576 | 586 | screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); |
| 577 | 587 | screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); |
| 578 | - screeningOutResult.setRecDoctor(screeningModels.get(0).getRecDoctor()); | |
| 588 | + screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor()); | |
| 579 | 589 | screeningOutResult.setId(screeningModels.get(0).getId()); |
| 580 | 590 | screeningOutResult.setPid(screeningModels.get(0).getPid()); |
| 581 | 591 | } |
| 582 | 592 | } |
| 583 | - data.add(screeningOutResult); | |
| 593 | + Users serviceUsers = usersService.getUsers(userId); | |
| 594 | + if(null != serviceUsers){ | |
| 595 | + // 不是主任的就按当前账号医生分 | |
| 596 | + if(serviceUsers.getZhiChenId() != 4){ | |
| 597 | + if(userId.toString().equals(screeningOutResult.getApplyDoctor()) && ckFlag){ | |
| 598 | + data.add(screeningOutResult); | |
| 599 | + } | |
| 600 | + }else{ | |
| 601 | + // 是主任就全显示 | |
| 602 | + data.add(screeningOutResult); | |
| 603 | + } | |
| 604 | + } | |
| 584 | 605 | } |
| 585 | 606 | } |
| 586 | 607 | PageInfo pageInfo = new PageInfo(); |
| ... | ... | @@ -680,6 +701,7 @@ |
| 680 | 701 | referralApplyScreeningModel.setModified(new Date()); |
| 681 | 702 | referralApplyScreeningModel.setName(patientBaseResult.getName()); |
| 682 | 703 | referralApplyScreeningModel.setStatus(1); // 待确认 |
| 704 | + referralApplyScreeningModel.setReason(patientBaseResult.getReason()); | |
| 683 | 705 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 684 | 706 | patientsQuery.setCardNo(patientBaseResult.getCardNo()); |
| 685 | 707 | patientsQuery.setYn(1); |