Commit 8f33209fa28b18c5c1860e65c644701f4ef07b81
1 parent
d0461b526c
Exists in
master
and in
8 other branches
修改产检删除
Showing 1 changed file with 13 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
8f33209
| ... | ... | @@ -114,9 +114,9 @@ |
| 114 | 114 | Patients patients = patientsService.findOnePatientById(record.getParentId()); |
| 115 | 115 | String dueWeek = ""; |
| 116 | 116 | if (null != patients) { |
| 117 | - if (patients.getDueStatus() == 1&&patients.getType()==3) { | |
| 117 | + if (patients.getDueStatus()!=null&&patients.getDueStatus() == 1&&patients.getType()==3) { | |
| 118 | 118 | dueWeek = "终止妊娠"; |
| 119 | - } else if (patients.getType()==3&&patients.getDueStatus() == 0) { | |
| 119 | + } else if (patients.getType()==3) { | |
| 120 | 120 | dueWeek = "已分娩"; |
| 121 | 121 | } else { |
| 122 | 122 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 123 | 123 | |
| ... | ... | @@ -153,16 +153,18 @@ |
| 153 | 153 | List level = new ArrayList(); |
| 154 | 154 | try { |
| 155 | 155 | for (Object str : record.gethLevel()) { |
| 156 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString()); | |
| 157 | - if (null != basicConfig) { | |
| 158 | - Map map = new HashMap(); | |
| 159 | - String name = basicConfig.getName(); | |
| 160 | - if (name.indexOf("预警") > -1) { | |
| 161 | - name = name.replace("预警", ""); | |
| 156 | + if(null!=str&&StringUtils.isNotEmpty(str.toString())){ | |
| 157 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString()); | |
| 158 | + if (null != basicConfig) { | |
| 159 | + Map map = new HashMap(); | |
| 160 | + String name = basicConfig.getName(); | |
| 161 | + if (name.indexOf("预警") > -1) { | |
| 162 | + name = name.replace("预警", ""); | |
| 163 | + } | |
| 164 | + map.put("name", name); | |
| 165 | + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 166 | + level.add(map); | |
| 162 | 167 | } |
| 163 | - map.put("name", name); | |
| 164 | - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 165 | - level.add(map); | |
| 166 | 168 | } |
| 167 | 169 | } |
| 168 | 170 | } catch (Exception e) { |