Commit 772898e77f0558168b760cd836981ee8ad3f5ce8
1 parent
d91dbb66f3
Exists in
master
and in
6 other branches
其他高危
Showing 1 changed file with 21 additions and 19 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
View file @
772898e
| ... | ... | @@ -67,7 +67,7 @@ |
| 67 | 67 | this.commonService = commonService; |
| 68 | 68 | this.hospital = hospital; |
| 69 | 69 | this.basicConfigService = basicConfigService; |
| 70 | - this.antenatalExaminationService=antenatalExaminationService; | |
| 70 | + this.antenatalExaminationService = antenatalExaminationService; | |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | @Override |
| ... | ... | @@ -129,7 +129,7 @@ |
| 129 | 129 | |
| 130 | 130 | antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); |
| 131 | 131 | antExManagerResult.setChTimes(dichi); |
| 132 | - handleRisk(e,antExManagerResult); | |
| 132 | + handleRisk(e, antExManagerResult); | |
| 133 | 133 | |
| 134 | 134 | data.add(antExManagerResult); |
| 135 | 135 | } catch (Exception e1) { |
| ... | ... | @@ -145,7 +145,7 @@ |
| 145 | 145 | * @param e |
| 146 | 146 | * @param antExManagerResult |
| 147 | 147 | */ |
| 148 | - private void handleRisk(AntExRecordModel e , AntExManagerResult antExManagerResult){ | |
| 148 | + private void handleRisk(AntExRecordModel e, AntExManagerResult antExManagerResult) { | |
| 149 | 149 | if (StringUtils.isNotEmpty(e.getfId())) { |
| 150 | 150 | String risk = null; |
| 151 | 151 | if (e.getType() == 2) { |
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | |
| 155 | 155 | |
| ... | ... | @@ -159,28 +159,30 @@ |
| 159 | 159 | risk = model.getOtherRisk(); |
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | - Map result = commonService.resolveOtherRisk(risk); | |
| 163 | - if(!result.isEmpty()){ | |
| 162 | + Map result = commonService.resolveOtherRisk(risk); | |
| 163 | + String name = null, level = null, score = null; | |
| 164 | + if (!result.isEmpty()) { | |
| 164 | 165 | //高危因素名字 |
| 165 | - String name =result.get("name").toString(); | |
| 166 | - String level =result.get("levelId").toString(); | |
| 167 | - String score =result.get("score").toString(); | |
| 166 | + name = result.get("name").toString(); | |
| 167 | + level = result.get("levelId").toString(); | |
| 168 | + score = result.get("score").toString(); | |
| 168 | 169 | |
| 169 | - if(org.apache.commons.lang.StringUtils.isNotEmpty(level) &&!"null".equals(level)){ | |
| 170 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { | |
| 170 | 171 | e.gethLevel().add(level); |
| 171 | 172 | } |
| 172 | 173 | |
| 173 | - //高危因素 | |
| 174 | - antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); | |
| 175 | - String ri= commonService.resloveFactor(e.gethRisk()); | |
| 176 | - if(ri.isEmpty()){ | |
| 177 | - ri=name; | |
| 178 | - }else if(StringUtils.isNotEmpty(name)){ | |
| 179 | - ri+=","+name; | |
| 180 | - } | |
| 181 | - antExManagerResult.setRiskFactor(ri); | |
| 182 | - antExManagerResult.setRiskScore((e.gethScore()+NumberUtils.toInt(score,0))+""); | |
| 174 | + | |
| 183 | 175 | } |
| 176 | + //高危因素 | |
| 177 | + antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); | |
| 178 | + String ri = commonService.resloveFactor(e.gethRisk()); | |
| 179 | + if (ri.isEmpty()) { | |
| 180 | + ri = name; | |
| 181 | + } else if (StringUtils.isNotEmpty(name)) { | |
| 182 | + ri += "," + name; | |
| 183 | + } | |
| 184 | + antExManagerResult.setRiskFactor(ri); | |
| 185 | + antExManagerResult.setRiskScore((e.gethScore() + NumberUtils.toInt(score, 0)) + ""); | |
| 184 | 186 | } |
| 185 | 187 | } |
| 186 | 188 | } |