Commit e9440551b4728c8eeea9f8071886ef99d92dc5fa
1 parent
66e50d649e
Exists in
dev
产妇转诊
Showing 1 changed file with 20 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
e944055
| ... | ... | @@ -525,8 +525,8 @@ |
| 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()); | |
| 528 | + if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getQueryNo())){ | |
| 529 | + medicalRecordVo.setCardNo(applyScreeningQueryRequest.getQueryNo()); | |
| 530 | 530 | } |
| 531 | 531 | List<MedicalRecordVo> medicalRecordVoList = appointmentService.queryList(medicalRecordVo); |
| 532 | 532 | if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ |
| 533 | 533 | |
| 534 | 534 | |
| 535 | 535 | |
| 536 | 536 | |
| ... | ... | @@ -551,25 +551,29 @@ |
| 551 | 551 | if(CollectionUtils.isNotEmpty(patientsList)){ |
| 552 | 552 | Patients patients = patientsList.get(0); |
| 553 | 553 | // 高危因素 |
| 554 | - List level = new ArrayList(); | |
| 555 | - try { | |
| 556 | - List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); | |
| 557 | - for (String str : list) { | |
| 558 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); | |
| 559 | - if (null != basicConfig) { | |
| 560 | - Map map = new HashMap(); | |
| 561 | - basicConfig.replenRisk(map); | |
| 562 | - if (!level.contains(map)){ | |
| 563 | - level.add(map); | |
| 554 | + if(StringUtils.isNotEmpty(patients.getRiskLevelId())){ | |
| 555 | + List level = new ArrayList(); | |
| 556 | + try { | |
| 557 | + List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); | |
| 558 | + for (String str : list) { | |
| 559 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); | |
| 560 | + if (null != basicConfig) { | |
| 561 | + Map map = new HashMap(); | |
| 562 | + basicConfig.replenRisk(map); | |
| 563 | + if (!level.contains(map)){ | |
| 564 | + level.add(map); | |
| 565 | + } | |
| 564 | 566 | } |
| 565 | 567 | } |
| 568 | + } catch (Exception e) { | |
| 569 | + ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); | |
| 566 | 570 | } |
| 567 | - } catch (Exception e) { | |
| 568 | - ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); | |
| 571 | + screeningOutResult.setrLevel(level); | |
| 569 | 572 | } |
| 570 | - screeningOutResult.setrLevel(level); | |
| 571 | 573 | // 高危风险因素 |
| 572 | - screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId())); | |
| 574 | + if(CollectionUtils.isNotEmpty(patients.getRiskFactorId())){ | |
| 575 | + screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId())); | |
| 576 | + } | |
| 573 | 577 | } |
| 574 | 578 | ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery(); |
| 575 | 579 | query.setCardNo(recordVo.getCardNo()); |