From ba9db040cbf96a9141e2cc6c25332aa3c23d4e4f Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 8 Jan 2018 15:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/HosptialHighRisk.java | 10 ++++++++++ .../src/main/java/com/lyms/platform/query/AntExQuery.java | 1 - .../platform/operate/web/controller/TestController.java | 3 ++- .../operate/web/facade/HosptialHighRiskFacade.java | 14 +++++++++++++- .../operate/web/worker/AntexOtherHighRiskWorker.java | 6 +++--- .../operate/web/worker/AntexcOtherHighRiskWorker.java | 6 +++--- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/HosptialHighRisk.java b/platform-dal/src/main/java/com/lyms/platform/pojo/HosptialHighRisk.java index 8cc6f7c..afb6196 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/HosptialHighRisk.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/HosptialHighRisk.java @@ -35,6 +35,16 @@ public class HosptialHighRisk extends BaseModel { //颜色 private String color; + private String colorName; + + public String getColorName() { + return colorName; + } + + public void setColorName(String colorName) { + this.colorName = colorName; + } + public String getCode() { return code; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index b660917..cc23220 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -151,7 +151,6 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { } if(null!=otherRisk){ condition= condition.and("otherRisk",otherRisk, MongoOper.NE); - condition= condition.and("otherRisk",true, MongoOper.EXISTS); } if(null!=checkDoctor){ condition= condition.and("checkDoctor",checkDoctor, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index ce2b984..e380738 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -20,6 +20,7 @@ import com.lyms.platform.operate.web.facade.SieveFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.SyncDataTaskService; +import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker; import com.lyms.platform.operate.web.worker.AntexcOtherHighRiskWorker; import com.lyms.platform.operate.web.worker.BabyBuildSerToPatientSerWorker; import com.lyms.platform.operate.web.worker.BuildSerToPatientSerWorker; @@ -206,7 +207,7 @@ public class TestController { int patientCount = antenatalExaminationService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); System.out.println("一共需要处理数据量：" + patientCount); - commonThreadPool.execute(new AntexcOtherHighRiskWorker(0, patientCount, antenatalExaminationService, hosptialHighRiskService, basicConfigService, 1000, patientCount)); + commonThreadPool.execute(new AntexOtherHighRiskWorker(0, patientCount, antenatalExaminationService, hosptialHighRiskService, basicConfigService, 1000, patientCount)); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrormsg("一共需要处理数据量：" + patientCount); return baseResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java index 803e656..a3da982 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java @@ -40,6 +40,15 @@ public class HosptialHighRiskFacade { colorMap.put("315107bd-91fe-42a1-9237-752f3c046a40", "risk_" + RiskDefaultTypeEnum.getColor("黄色")); } + private static Map scoreMap = new HashMap<>(); + + static { + scoreMap.put("5769eef90cf22c3157577422", "5"); + scoreMap.put("5769f0640cf2d37f034793a3", "10"); + scoreMap.put("5769f0650cf2d37f034793a4", "15"); + scoreMap.put("5769f0650cf2d37f034793a5", "20"); + } + /** * 页面初始化数据 * @@ -98,7 +107,10 @@ public class HosptialHighRiskFacade { List hosptialHighRisks = hosptialHighRiskService.queryHosptialHighRisk(hosptialHighRiskQuery); if (CollectionUtils.isNotEmpty(hosptialHighRisks)) { for (HosptialHighRisk hr : hosptialHighRisks) { - hr.setColor(colorMap.get(hr.getColor())); + hr.setColorName(colorMap.get(hr.getColor())); + if(scoreMap.containsKey(hr.getCode())){ + hr.setScore(Integer.parseInt(scoreMap.get(hr.getCode()))); + } } baseResponse.setObject(hosptialHighRisks); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java index b707490..a68aa0a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java @@ -7,7 +7,6 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CollectionUtils; -import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.HosptialHighRisk; import com.lyms.platform.query.AntExQuery; @@ -83,8 +82,9 @@ public class AntexOtherHighRiskWorker implements Runnable { continue; } if (StringUtils.isNotEmpty(otherMap.get("fxpf"))) { - String id = otherMap.get("fxpf").toString(); - pingfen = FunvCommonUtil.getBaseicConfigByid(id, basicConfigService); + // String id = otherMap.get("fxpf").toString(); + // pingfen = FunvCommonUtil.getBaseicConfigByid(id, basicConfigService); + pingfen = otherMap.get("fxpf").toString(); } else { continue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java index 916e166..e5b5504 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java @@ -7,7 +7,6 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CollectionUtils; -import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.HosptialHighRisk; import com.lyms.platform.query.AntExChuQuery; @@ -83,8 +82,9 @@ public class AntexcOtherHighRiskWorker implements Runnable { continue; } if (StringUtils.isNotEmpty(otherMap.get("fxpf"))) { - String id = otherMap.get("fxpf").toString(); - pingfen = FunvCommonUtil.getBaseicConfigByid(id, basicConfigService); + // String id = otherMap.get("fxpf").toString(); + // pingfen = FunvCommonUtil.getBaseicConfigByid(id, basicConfigService); + pingfen = otherMap.get("fxpf").toString(); } else { continue; } -- 1.8.3.1