Commit b20239520e05fe22654ae760fdcabc36f1a9bf19
1 parent
5d79c168c9
Exists in
master
and in
6 other branches
儿保总概率统计
Showing 1 changed file with 7 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
b202395
| ... | ... | @@ -1730,11 +1730,14 @@ |
| 1730 | 1730 | healthy.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6");//健康id// |
| 1731 | 1731 | healthy.add("a427da89-594a-46c2-b9f7-1b0d355ce54c");//28＞BMI＞25 |
| 1732 | 1732 | healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5 |
| 1733 | - if (null == patients.getRiskFactorId() || healthy.containsAll(patients.getRiskFactorId())) { | |
| 1734 | - patientBaseResult.setFlag(false); | |
| 1735 | - } else { | |
| 1736 | - patientBaseResult.setFlag(true); | |
| 1733 | + if (patients != null) { | |
| 1734 | + if (patients.getRiskFactorId() == null || healthy.containsAll(patients.getRiskFactorId())) { | |
| 1735 | + patientBaseResult.setFlag(false); | |
| 1736 | + } else { | |
| 1737 | + patientBaseResult.setFlag(true); | |
| 1738 | + } | |
| 1737 | 1739 | } |
| 1740 | + | |
| 1738 | 1741 | if (null != pw.getPrintingTime()) { |
| 1739 | 1742 | int hasPrint = DateUtil.getDays(pw.getPrintingTime(), new Date()); |
| 1740 | 1743 | if (hasPrint > 21) { |