From ea4b424a02c33784651518455ae8dc0f69022ed5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 22 Jan 2018 10:25:48 +0800 Subject: [PATCH] 1 --- .../operate/web/worker/AntExRecordWorker.java | 43 ++++++++++++---------- 1 file changed, 23 insertions(+), 20 deletions(-) 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 4ac326f..3828a1b 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 @@ -118,25 +118,28 @@ public class AntExRecordWorker implements Callable> { antExRecordQuery1.setCheckTimeEnd(e.getCheckTime()); antExRecordQuery1.setPid(e.getPid()); antExRecordQuery1.setHospitalId(hospital); + int dichi = 0, cdichi = 0, tcount = 0, tallcount = 0; + if (StringUtils.isNotEmpty(e.getPid())) { + //本院低次 + dichi = recordService.count(antExRecordQuery1); - //本院低次 - int dichi = recordService.count(antExRecordQuery1); - - antExRecordQuery1.setType(1); - //初诊的次数 - int cdichi = 0; - //等于初诊的时候才减 - if (e.getType() == 1) { - cdichi = recordService.count(antExRecordQuery1); - } - antExRecordQuery1.setType(null); - antExRecordQuery1.setHospitalId(null); - int tcount = recordService.count(antExRecordQuery1); - antExRecordQuery1.setType(1); - int tallcount = 0; - if (e.getType() == 1) { - tallcount = recordService.count(antExRecordQuery1); + antExRecordQuery1.setType(1); + //初诊的次数 + cdichi = 0; + //等于初诊的时候才减 + if (e.getType() == 1) { + cdichi = recordService.count(antExRecordQuery1); + } + antExRecordQuery1.setType(null); + antExRecordQuery1.setHospitalId(null); + tcount = recordService.count(antExRecordQuery1); + antExRecordQuery1.setType(1); + tallcount = 0; + if (e.getType() == 1) { + tallcount = recordService.count(antExRecordQuery1); + } } + antExManagerResult.settTimes(tcount - tallcount); antExManagerResult.setChTimes(dichi - cdichi); handleRisk(e, antExManagerResult); @@ -186,10 +189,10 @@ public class AntExRecordWorker implements Callable> { //高危因素 antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); String ri = commonService.resloveFactor(e.gethRisk()); - if(StringUtils.isNotEmpty(name.toString())){ - ri = name.substring(0,name.length()-1); + if (StringUtils.isNotEmpty(name.toString())) { + ri = name.substring(0, name.length() - 1); } else if (StringUtils.isNotEmpty(name.toString())) { - ri += "," + name.substring(0,name.length()-1); + ri += "," + name.substring(0, name.length() - 1); } antExManagerResult.setRiskFactor(ri); antExManagerResult.setRiskScore((e.gethScore() + score) + ""); -- 1.8.3.1