Commit 1377bf007437951b61c08360104fc5a83f1bb9aa
1 parent
97553815eb
Exists in
dev
产妇转诊
Showing 1 changed file with 30 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
1377bf0
| ... | ... | @@ -537,7 +537,7 @@ |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getQueryNo())){ |
| 540 | - medicalRecordVo.setCardNo(applyScreeningQueryRequest.getQueryNo()); | |
| 540 | + medicalRecordVo.setQueryNo(applyScreeningQueryRequest.getQueryNo()); | |
| 541 | 541 | } |
| 542 | 542 | List<MedicalRecordVo> medicalRecordVoList = appointmentService.queryList(medicalRecordVo); |
| 543 | 543 | if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ |
| ... | ... | @@ -612,7 +612,7 @@ |
| 612 | 612 | |
| 613 | 613 | public BaseListResponse queryMedicalRecord2(ApplyScreeningQueryRequest applyScreeningQueryRequest,Integer userId) { |
| 614 | 614 | ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery(); |
| 615 | - query.setCardNo(applyScreeningQueryRequest.getCardNo()); | |
| 615 | + query.setQueryNo(applyScreeningQueryRequest.getQueryNo()); | |
| 616 | 616 | query.setHospitalId("2100002419"); |
| 617 | 617 | Users serviceUsers = usersService.getUsers(userId); |
| 618 | 618 | if(serviceUsers != null){ |
| 619 | 619 | |
| 620 | 620 | |
| ... | ... | @@ -633,16 +633,22 @@ |
| 633 | 633 | for (ReferralApplyScreeningModel screeningModel : screeningModels) { |
| 634 | 634 | ApplyScreeningOutResult applyScreeningOutResult = new ApplyScreeningOutResult(); |
| 635 | 635 | applyScreeningOutResult.setName(screeningModel.getName()); |
| 636 | - applyScreeningOutResult.setDueDate(DateUtil.getYyyyMmDd(screeningModel.getDueDate())); | |
| 637 | - applyScreeningOutResult.setAge(screeningModel.getAge().toString()); | |
| 636 | + if(screeningModel.getDueDate() != null ){ | |
| 637 | + applyScreeningOutResult.setDueDate(DateUtil.getYyyyMmDd(screeningModel.getDueDate())); | |
| 638 | + } | |
| 639 | + if(screeningModel.getAge() != null ){ | |
| 640 | + applyScreeningOutResult.setAge(screeningModel.getAge().toString()); | |
| 641 | + } | |
| 638 | 642 | applyScreeningOutResult.setTransferredDepartment(screeningModel.getTransferredDepartment()); |
| 639 | 643 | applyScreeningOutResult.setOutDepartment(screeningModel.getOutDepartment()); |
| 640 | - applyScreeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModel.getCreated())); | |
| 644 | + if(screeningModel.getCreated() != null ){ | |
| 645 | + applyScreeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModel.getCreated())); | |
| 646 | + } | |
| 641 | 647 | applyScreeningOutResult.setrRisk(screeningModel.getrRisk()); |
| 642 | 648 | data.add(applyScreeningOutResult); |
| 643 | 649 | } |
| 644 | 650 | |
| 645 | - return new BaseListResponse().setData(screeningModels).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo()); | |
| 651 | + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo()); | |
| 646 | 652 | } |
| 647 | 653 | |
| 648 | 654 | public BaseResponse queryMedicalInfo(ApplyScreeningQueryRequest applyScreeningQueryRequest,Integer userId) { |
| 649 | 655 | |
| 650 | 656 | |
| 651 | 657 | |
| 652 | 658 | |
| ... | ... | @@ -745,25 +751,29 @@ |
| 745 | 751 | if(CollectionUtils.isNotEmpty(patientsList)){ |
| 746 | 752 | Patients patients = patientsList.get(0); |
| 747 | 753 | // 高危因素 |
| 748 | - List level = new ArrayList(); | |
| 749 | - try { | |
| 750 | - List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); | |
| 751 | - for (String str : list) { | |
| 752 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); | |
| 753 | - if (null != basicConfig) { | |
| 754 | - Map map = new HashMap(); | |
| 755 | - basicConfig.replenRisk(map); | |
| 756 | - if (!level.contains(map)){ | |
| 757 | - level.add(map); | |
| 754 | + if(StringUtils.isNotEmpty(patients.getRiskLevelId())){ | |
| 755 | + List level = new ArrayList(); | |
| 756 | + try { | |
| 757 | + List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); | |
| 758 | + for (String str : list) { | |
| 759 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); | |
| 760 | + if (null != basicConfig) { | |
| 761 | + Map map = new HashMap(); | |
| 762 | + basicConfig.replenRisk(map); | |
| 763 | + if (!level.contains(map)){ | |
| 764 | + level.add(map); | |
| 765 | + } | |
| 758 | 766 | } |
| 759 | 767 | } |
| 768 | + } catch (Exception e) { | |
| 769 | + ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); | |
| 760 | 770 | } |
| 761 | - } catch (Exception e) { | |
| 762 | - ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); | |
| 771 | + referralApplyScreeningModel.setrLevel(level); | |
| 763 | 772 | } |
| 764 | - referralApplyScreeningModel.setrLevel(level); | |
| 765 | 773 | // 高危风险因素 |
| 766 | - referralApplyScreeningModel.setrRisk(queryRiskListName(patients.getRiskFactorId())); | |
| 774 | + if(CollectionUtils.isNotEmpty(patients.getRiskFactorId())){ | |
| 775 | + referralApplyScreeningModel.setrRisk(queryRiskListName(patients.getRiskFactorId())); | |
| 776 | + } | |
| 767 | 777 | referralApplyScreeningModel.setParentId(patients.getId()); |
| 768 | 778 | referralApplyScreeningModel.setPid(patients.getPid()); |
| 769 | 779 | } |