jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 66e50d649e5989aca3195405e884a6ce5641fffe

Authored by haorp
1 parent bf4f236238
Exists in dev

产妇转诊

Showing 2 changed files with 51 additions and 40 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java View file @ 66e50d6
... ... @@ -531,7 +531,6 @@
531 531 List<MedicalRecordVo> medicalRecordVoList = appointmentService.queryList(medicalRecordVo);
532 532 if(CollectionUtils.isNotEmpty(medicalRecordVoList)){
533 533 for (MedicalRecordVo recordVo : medicalRecordVoList) {
534   - Boolean ckFlag = true; // 判断是否为产科
535 534 ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult();
536 535 screeningOutResult.setName(recordVo.getName());
537 536 String age1 = recordVo.getAge().substring(0,8);
... ... @@ -541,11 +540,7 @@
541 540 screeningOutResult.setCardNo(recordVo.getCardNo());
542 541 screeningOutResult.setDueDate(recordVo.getDeliveryTime());
543 542 screeningOutResult.setPhone(recordVo.getPhone());
544   - if(recordVo.getDepartment().contains("产科")){
545   - ckFlag = true;
546   - }else{
547   - ckFlag = false;
548   - }
  543 + screeningOutResult.setDepartment(recordVo.getDepartment());
549 544 // 查建档
550 545 PatientsQuery patientsQuery = new PatientsQuery();
551 546 patientsQuery.setCardNo(recordVo.getCardNo());
552 547  
553 548  
554 549  
... ... @@ -575,33 +570,38 @@
575 570 screeningOutResult.setrLevel(level);
576 571 // 高危风险因素
577 572 screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId()));
578   -
579   - ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery();
580   - query.setCardNo(recordVo.getCardNo());
581   - List<ReferralApplyScreeningModel> screeningModels =
582   - applyScreeningService.queryReferralApplyScreeningWithQuery(query);
583   - if (CollectionUtils.isNotEmpty(screeningModels)){
584   - screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment());
585   - screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment());
586   - screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated()));
587   - screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived()));
588   - screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor());
589   - screeningOutResult.setId(screeningModels.get(0).getId());
590   - screeningOutResult.setPid(screeningModels.get(0).getPid());
591   - }
592 573 }
593   - Users serviceUsers = usersService.getUsers(userId);
594   - if(null != serviceUsers){
595   - // 不是主任的就按当前账号医生分
596   - if(serviceUsers.getZhiChenId() != 4){
597   - if(userId.toString().equals(screeningOutResult.getApplyDoctor()) && ckFlag){
  574 + ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery();
  575 + query.setCardNo(recordVo.getCardNo());
  576 + List<ReferralApplyScreeningModel> screeningModels =
  577 + applyScreeningService.queryReferralApplyScreeningWithQuery(query);
  578 + if (CollectionUtils.isNotEmpty(screeningModels)){
  579 + screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment());
  580 + screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment());
  581 + screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated()));
  582 + screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived()));
  583 + screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor());
  584 + screeningOutResult.setId(screeningModels.get(0).getId());
  585 + screeningOutResult.setPid(screeningModels.get(0).getPid());
  586 + Users serviceUsers = usersService.getUsers(userId);
  587 + if(null != serviceUsers){
  588 + // 不是主任的就按当前账号医生分
  589 + if(serviceUsers.getZhiChenId() != 4){
  590 + if(userId.toString().equals(screeningOutResult.getApplyDoctor())){
  591 + data.add(screeningOutResult);
  592 + }
  593 + }else{
  594 + // 是主任就全显示
598 595 data.add(screeningOutResult);
599 596 }
600   - }else{
601   - // 是主任就全显示
602   - data.add(screeningOutResult);
  597 + // 医生名字
  598 + screeningOutResult.setApplyDoctor(serviceUsers.getName());
603 599 }
604 600 }
  601 + else{
  602 + // 是主任就全显示
  603 + data.add(screeningOutResult);
  604 + }
605 605 }
606 606 }
607 607 PageInfo pageInfo = new PageInfo();
... ... @@ -678,17 +678,18 @@
678 678 List<ReferralApplyScreeningModel> screeningModels =
679 679 applyScreeningService.queryReferralApplyScreeningWithQuery(query);
680 680 if(CollectionUtils.isNotEmpty(screeningModels)){
681   - ReferralApplyScreeningModel screeningModel = screeningModels.get(0);
682   - ReferralApplyScreeningQuery screeningQuery = new ReferralApplyScreeningQuery();
683   - screeningQuery.setOutHospitalId(screeningModel.getHospitalId());
684   - screeningQuery.setTransferredHospital(screeningModel.getHospitalId());
685   - screeningQuery.setPid(screeningModel.getPid());
686   - screeningQuery.setId(screeningModel.getId());
687   - referralApplyScreeningModel.setOutDepartment(screeningModel.getTransferredDepartment());
688   - referralApplyScreeningModel.setTransferredDepartment(patientBaseResult.getChangeDepartment());
689   - referralApplyScreeningModel.setReason(patientBaseResult.getReason());
690   - referralApplyScreeningModel.setModified(new Date());
691   - applyScreeningService.updateByParentId(screeningQuery,referralApplyScreeningModel);
  681 +// ReferralApplyScreeningModel screeningModel = screeningModels.get(0);
  682 +// ReferralApplyScreeningQuery screeningQuery = new ReferralApplyScreeningQuery();
  683 +// screeningQuery.setOutHospitalId(screeningModel.getHospitalId());
  684 +// screeningQuery.setTransferredHospital(screeningModel.getHospitalId());
  685 +// screeningQuery.setPid(screeningModel.getPid());
  686 +// screeningQuery.setId(screeningModel.getId());
  687 +// referralApplyScreeningModel.setOutDepartment("产科");
  688 +// referralApplyScreeningModel.setTransferredDepartment(patientBaseResult.getChangeDepartment());
  689 +// referralApplyScreeningModel.setReason(patientBaseResult.getReason());
  690 +// referralApplyScreeningModel.setModified(new Date());
  691 +// applyScreeningService.updateByParentId(screeningQuery,referralApplyScreeningModel);
  692 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该患者已经完成转诊");
692 693 }else{
693 694 referralApplyScreeningModel.setOutHospitalId("2100002419");
694 695 referralApplyScreeningModel.setTransferredHospital("2100002419");
... ... @@ -750,7 +751,7 @@
750 751 Users users = usersService.getUsers(userId);
751 752 if(users != null){
752 753 // 转出科室
753   - referralApplyScreeningModel.setOutDepartment(users.getName());
  754 + referralApplyScreeningModel.setOutDepartment("产科");
754 755 }
755 756 }
756 757 applyScreeningService.addOneReferralApplyScreening(referralApplyScreeningModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java View file @ 66e50d6
... ... @@ -78,6 +78,16 @@
78 78 //转出科室
79 79 private String outDepartment;
80 80  
  81 + private String department;
  82 +
  83 + public String getDepartment() {
  84 + return department;
  85 + }
  86 +
  87 + public void setDepartment(String department) {
  88 + this.department = department;
  89 + }
  90 +
81 91 public String getTransferredDepartment() {
82 92 return transferredDepartment;
83 93 }