From e9440551b4728c8eeea9f8071886ef99d92dc5fa Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Fri, 13 Jun 2025 19:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyScreeningFacade.java | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index d1f0af3..38bc365 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -525,8 +525,8 @@ public class ApplyScreeningFacade { medicalRecordVo.setNeed("true"); medicalRecordVo.setLimit(applyScreeningQueryRequest.getLimit()); medicalRecordVo.setPage(applyScreeningQueryRequest.getPage()); - if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getCardNo())){ - medicalRecordVo.setCardNo(applyScreeningQueryRequest.getCardNo()); + if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getQueryNo())){ + medicalRecordVo.setCardNo(applyScreeningQueryRequest.getQueryNo()); } List medicalRecordVoList = appointmentService.queryList(medicalRecordVo); if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ @@ -551,25 +551,29 @@ public class ApplyScreeningFacade { if(CollectionUtils.isNotEmpty(patientsList)){ Patients patients = patientsList.get(0); // 高危因素 - List level = new ArrayList(); - try { - List list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); - for (String str : list) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); - if (null != basicConfig) { - Map map = new HashMap(); - basicConfig.replenRisk(map); - if (!level.contains(map)){ - level.add(map); + if(StringUtils.isNotEmpty(patients.getRiskLevelId())){ + List level = new ArrayList(); + try { + List list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); + for (String str : list) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); + if (null != basicConfig) { + Map map = new HashMap(); + basicConfig.replenRisk(map); + if (!level.contains(map)){ + level.add(map); + } } } + } catch (Exception e) { + ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); } - } catch (Exception e) { - ExceptionUtils.catchException(e, "patients.getRiskLevelId error."); + screeningOutResult.setrLevel(level); } - screeningOutResult.setrLevel(level); // 高危风险因素 - screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId())); + if(CollectionUtils.isNotEmpty(patients.getRiskFactorId())){ + screeningOutResult.setrRisk(queryRiskListName(patients.getRiskFactorId())); + } } ReferralApplyScreeningQuery query = new ReferralApplyScreeningQuery(); query.setCardNo(recordVo.getCardNo()); -- 1.8.3.1