diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index bdfe044..f95e2ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -67,7 +67,7 @@ public class AntExRecordWorker implements Callable> { this.commonService = commonService; this.hospital = hospital; this.basicConfigService = basicConfigService; - this.antenatalExaminationService=antenatalExaminationService; + this.antenatalExaminationService = antenatalExaminationService; } @Override @@ -129,7 +129,7 @@ public class AntExRecordWorker implements Callable> { antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); antExManagerResult.setChTimes(dichi); - handleRisk(e,antExManagerResult); + handleRisk(e, antExManagerResult); data.add(antExManagerResult); } catch (Exception e1) { @@ -145,7 +145,7 @@ public class AntExRecordWorker implements Callable> { * @param e * @param antExManagerResult */ - private void handleRisk(AntExRecordModel e , AntExManagerResult antExManagerResult){ + private void handleRisk(AntExRecordModel e, AntExManagerResult antExManagerResult) { if (StringUtils.isNotEmpty(e.getfId())) { String risk = null; if (e.getType() == 2) { @@ -159,28 +159,30 @@ public class AntExRecordWorker implements Callable> { risk = model.getOtherRisk(); } } - Map result = commonService.resolveOtherRisk(risk); - if(!result.isEmpty()){ + Map result = commonService.resolveOtherRisk(risk); + String name = null, level = null, score = null; + if (!result.isEmpty()) { //高危因素名字 - String name =result.get("name").toString(); - String level =result.get("levelId").toString(); - String score =result.get("score").toString(); + name = result.get("name").toString(); + level = result.get("levelId").toString(); + score = result.get("score").toString(); - if(org.apache.commons.lang.StringUtils.isNotEmpty(level) &&!"null".equals(level)){ + if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { e.gethLevel().add(level); } - //高危因素 - antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); - String ri= commonService.resloveFactor(e.gethRisk()); - if(ri.isEmpty()){ - ri=name; - }else if(StringUtils.isNotEmpty(name)){ - ri+=","+name; - } - antExManagerResult.setRiskFactor(ri); - antExManagerResult.setRiskScore((e.gethScore()+NumberUtils.toInt(score,0))+""); + + } + //高危因素 + antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); + String ri = commonService.resloveFactor(e.gethRisk()); + if (ri.isEmpty()) { + ri = name; + } else if (StringUtils.isNotEmpty(name)) { + ri += "," + name; } + antExManagerResult.setRiskFactor(ri); + antExManagerResult.setRiskScore((e.gethScore() + NumberUtils.toInt(score, 0)) + ""); } } }