From 21ac0b16d03a39c281f856cc09aa0a48349028c5 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 1 Aug 2019 14:45:18 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 01c30c7..b7ec3d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -37,6 +38,7 @@ import jxl.write.WritableFont; import jxl.write.WritableSheet; import jxl.write.WritableWorkbook; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -1732,7 +1734,14 @@ public class PatientFacade { healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5 if (patients != null) { if (patients.getRiskFactorId() == null || healthy.containsAll(patients.getRiskFactorId())) { - patientBaseResult.setFlag(false); + if (StringUtils.isNotEmpty(patients.getoRiskFactor()) && !"null".equals(patients.getoRiskFactor())) + { + patientBaseResult.setFlag(true); + } + else + { + patientBaseResult.setFlag(false); + } } else { patientBaseResult.setFlag(true); } -- 1.8.3.1