Commit 21ac0b16d03a39c281f856cc09aa0a48349028c5
1 parent
c1bdbdfab0
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
21ac0b1
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 11 | 11 | import com.lyms.platform.common.result.BaseResponse; |
| 12 | 12 | import com.lyms.platform.common.utils.*; |
| 13 | +import com.lyms.platform.common.utils.StringUtils; | |
| 13 | 14 | import com.lyms.platform.operate.web.request.*; |
| 14 | 15 | import com.lyms.platform.operate.web.result.*; |
| 15 | 16 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| ... | ... | @@ -37,6 +38,7 @@ |
| 37 | 38 | import jxl.write.WritableSheet; |
| 38 | 39 | import jxl.write.WritableWorkbook; |
| 39 | 40 | import org.apache.commons.collections.CollectionUtils; |
| 41 | +import org.apache.commons.lang.*; | |
| 40 | 42 | import org.slf4j.Logger; |
| 41 | 43 | import org.slf4j.LoggerFactory; |
| 42 | 44 | import org.springframework.beans.factory.annotation.Autowired; |
| ... | ... | @@ -1732,7 +1734,14 @@ |
| 1732 | 1734 | healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5 |
| 1733 | 1735 | if (patients != null) { |
| 1734 | 1736 | if (patients.getRiskFactorId() == null || healthy.containsAll(patients.getRiskFactorId())) { |
| 1735 | - patientBaseResult.setFlag(false); | |
| 1737 | + if (StringUtils.isNotEmpty(patients.getoRiskFactor()) && !"null".equals(patients.getoRiskFactor())) | |
| 1738 | + { | |
| 1739 | + patientBaseResult.setFlag(true); | |
| 1740 | + } | |
| 1741 | + else | |
| 1742 | + { | |
| 1743 | + patientBaseResult.setFlag(false); | |
| 1744 | + } | |
| 1736 | 1745 | } else { |
| 1737 | 1746 | patientBaseResult.setFlag(true); |
| 1738 | 1747 | } |