From 98cc32f2bc0c53fee16c35690543afa2f454a209 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 25 Jan 2018 10:47:17 +0800 Subject: [PATCH] 1 --- .../com/lyms/platform/operate/web/facade/PatientServiceFacade.java | 7 +++++++ .../com/lyms/platform/operate/web/result/PatientSerResult.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 541831b..839cb78 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -415,6 +415,13 @@ public class PatientServiceFacade { result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); //高危因素 result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); + + if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) { + result.setRiskFactor(result.getRiskFactor() + "," + patients.getoRiskFactor()); + }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + result.setRiskFactor(patients.getoRiskFactor()); + } //高危等级颜色 result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); }else{ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java index e8497b5..d6629b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import com.lyms.platform.common.utils.StringUtils; + import java.util.List; import java.util.Map; @@ -184,6 +186,9 @@ public class PatientSerResult { } public String getRiskFactor() { + if(StringUtils.isEmpty(riskFactor)){ + return "-"; + } return riskFactor; } -- 1.8.3.1