Commit 4ce2dedb000bf1e0aa9eb5895128e2f23e4dce88
1 parent
cde775b8fe
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
4ce2ded
| ... | ... | @@ -941,9 +941,9 @@ |
| 941 | 941 | + findName(p.getHareaRegisterId()) + findName(p.getHstreetRegisterId()) + p.getHaddressRegister(); |
| 942 | 942 | result.put("丈夫户口所在地", hAddress.replace("null", "")); |
| 943 | 943 | //孕妇状态显示当前孕周 |
| 944 | - if ("1".equals(p.getType())) { | |
| 944 | + if (p.getType()!=null && "1".equals(p.getType().toString())) { | |
| 945 | 945 | result.put("结案状态", DateUtil.getWeekDesc(p.getLastMenses(),new Date())); |
| 946 | - }else if ("3".equals(p.getType())){ | |
| 946 | + }else if (p.getType()!=null && "3".equals(p.getType().toString())){ | |
| 947 | 947 | result.put("结案状态", "分娩"); |
| 948 | 948 | }else { |
| 949 | 949 | result.put("结案状态", ""); |