From 65fc309f9169c5a85e2e8238076adfe6e2413b9b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 20 Mar 2017 17:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/job/index/util/JDBCUtil.java | 13 ++++++ .../operate/web/facade/AntExRecordFacade.java | 2 +- .../operate/web/worker/AntExRecordWorker.java | 53 ++++++++++++++++++++-- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java index 9998221..0d9140e 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/util/JDBCUtil.java @@ -25,6 +25,19 @@ public class JDBCUtil { return con; } + public static Connection getMysqlConnectionForNewPlatform() { + Connection con = null; + try { + Class.forName("com.mysql.jdbc.Driver"); + String url = "jdbc:mysql://119.90.57.26:3306/center?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + String userName = "center"; + String pwd = "lyms2015"; + con = DriverManager.getConnection(url, userName, pwd); + } catch (Exception e) { + e.printStackTrace(); + } + return con; + } public static Connection getMysqlConnection() { Connection con = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index bd58f6c..cb4c24a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -289,7 +289,7 @@ public class AntExRecordFacade { if (end > antExRecordModelList.size()) { end = antExRecordModelList.size(); } - listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService))); + listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService,antExService))); } for (Future f : listFuture) { try { 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 f341651..af5f368 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 @@ -1,9 +1,12 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.AntExRecordService; +import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.CommonService; +import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.RiskPatientsResult; @@ -12,13 +15,18 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntExRecordModel; +import com.lyms.platform.pojo.AntenatalExaminationModel; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.AntExRecordQuery; import org.apache.commons.lang.math.NumberUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; /** @@ -38,7 +46,9 @@ public class AntExRecordWorker implements Callable> { private BasicConfigService basicConfigService; - public SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd"); + private AntenatalExaminationService antenatalExaminationService; + + public SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd"); public AntExRecordWorker(List record, boolean isRegion, @@ -47,7 +57,8 @@ public class AntExRecordWorker implements Callable> { AntExRecordService recordService, CommonService commonService, String hospital, - BasicConfigService basicConfigService) { + BasicConfigService basicConfigService, + AntenatalExaminationService antenatalExaminationService) { this.record = record; this.isRegion = isRegion; this.organizationService = organizationService; @@ -56,6 +67,7 @@ public class AntExRecordWorker implements Callable> { this.commonService = commonService; this.hospital = hospital; this.basicConfigService = basicConfigService; + this.antenatalExaminationService=antenatalExaminationService; } @Override @@ -114,15 +126,46 @@ public class AntExRecordWorker implements Callable> { //本院低次 int dichi = recordService.count(antExRecordQuery1); antExRecordQuery1.setHospitalId(null); + String fxys = ""; + if (StringUtils.isNotEmpty(e.getfId())) { + String risk = null; + if (e.getType() == 1) { + AntExChuModel model = antenatalExaminationService.findOne(e.getfId()); + if (null != model) { + risk = model.getOtherHighRisk(); + } + } else if (e.getType() == 2) { + AntenatalExaminationModel model = antenatalExaminationService.findOneById(e.getfId()); + if (null != model) { + risk = model.getOtherRisk(); + } + } + + try { + Map map = JsonUtil.str2Obj(risk, Map.class); + Object obj = map.get("fxysu"); + if (null != obj) { + fxys = obj.toString(); + } + } catch (Exception e1) { + } + } + antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); antExManagerResult.setChTimes(dichi); //高危因素 antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); - antExManagerResult.setRiskFactor(commonService.resloveFactor(e.gethRisk())); + String ri= commonService.resloveFactor(e.gethRisk()); + if(ri.isEmpty()){ + ri=fxys; + }else{ + ri+=","+fxys; + } + antExManagerResult.setRiskFactor(ri); data.add(antExManagerResult); - }catch (Exception e1){ - ExceptionUtils.catchException(e1,"antex worker error."); + } catch (Exception e1) { + ExceptionUtils.catchException(e1, "antex worker error."); } } return data; -- 1.8.3.1