From 5237ba6fa995ead7c968695af4075631039a0c8e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 8 Apr 2018 17:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=AF=8A=E6=96=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/DiagnoseEnums.java | 9 +- .../web/facade/AntenatalExaminationFacade.java | 447 ++++++++++++++++++--- 2 files changed, 405 insertions(+), 51 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java index f958755..d357bf4 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java @@ -205,7 +205,7 @@ public class DiagnoseEnums { //辅助检查——血常规 XHDB(3, "血红蛋白",5,TypeEnums.SZ.getId(),0,"g/L"), - XXBJS(4, "白细胞计数",5,TypeEnums.SZ.getId(),0,"×109/L"), + BXBJS(4, "白细胞计数",5,TypeEnums.SZ.getId(),0,"×109/L"), XXBJX(5, "血小板计数",5,TypeEnums.SZ.getId(),0,"×109/L"), CXGQT(6, "其他",5,TypeEnums.WZ.getId(),0,""), @@ -217,7 +217,7 @@ public class DiagnoseEnums { //辅助检查——肝功能 XQGBZAM(9, "血清谷丙转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"), XQGCZAM(10, "血清谷草转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"), - XDB(11, "白蛋白",7,TypeEnums.SZ.getId(),0,"g/L"), + BDB(11, "白蛋白",7,TypeEnums.SZ.getId(),0,"g/L"), ZDHS(12, "总胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"), JHDHS(13, "结合胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"), GGNBG(14, "丙肝——阳性（+）",7,TypeEnums.WZJ.getId(),1,""), @@ -227,11 +227,11 @@ public class DiagnoseEnums { YGBMKT(16, "乙肝表面抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), YGEKY(17, "乙肝e抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), YGEKT(18, "乙肝e抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), - YGKXKT(19, "乙肝核心抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), + YGHXKT(19, "乙肝核心抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), //辅助检查——肾功能 XQJG(20, "血清肌酐",9,TypeEnums.SZ.getId(),0,"μmol/L"), - XNXD(21, "血尿素氮",9,TypeEnums.SZ.getId(),0,"mmol/L"), + XNSD(21, "血尿素氮",9,TypeEnums.SZ.getId(),0,"mmol/L"), //辅助检查——梅毒血清实验 SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ",10,TypeEnums.WZJ.getId(),1,""), @@ -397,6 +397,7 @@ public class DiagnoseEnums { //消化系统类 YXGD(21, "乙型病毒性肝炎",38), WY(22, "胃炎",38), + YXGY(45, "乙型肝炎",38), DSY(23, "大三阳",38), XSY(24, "小三阳",38), BXGY(25, "丙型肝炎",38), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 7bc9a95..9a26971 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2718,12 +2718,12 @@ public class AntenatalExaminationFacade { { if (patients != null && patients.getBirth() != null) { - Double age = (double)DateUtil.getAge(patients.getBirth(), new Date()); + String age = String.valueOf(DateUtil.getAge(patients.getBirth(), new Date())); //年龄高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.age.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.age.getId()); + if (CollectionUtils.isNotEmpty(items)) { - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (compare(item,age) && CollectionUtils.isNotEmpty(item.getRiskIds())) { @@ -2735,13 +2735,13 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExcAddRequest.getBaricIndex())) { - Double baricIndex = Double.parseDouble(antExcAddRequest.getBaricIndex()); + String baricIndex = antExcAddRequest.getBaricIndex(); //BMI（体重指数）高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.bmi.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.bmi.getId()); + if (CollectionUtils.isNotEmpty(items)) { - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (compare(item,baricIndex) && CollectionUtils.isNotEmpty(item.getRiskIds())) { @@ -2754,13 +2754,13 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExcAddRequest.getHeight())) { - Double height = Double.parseDouble(antExcAddRequest.getHeight()); + String height = antExcAddRequest.getHeight(); //身高高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.height.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.height.getId()); + if (CollectionUtils.isNotEmpty(items)) { - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (compare(item,height) && CollectionUtils.isNotEmpty(item.getRiskIds())) { @@ -2772,14 +2772,14 @@ public class AntenatalExaminationFacade { if (antExcAddRequest.getAbortion() != null) { - Double abortion = (double)antExcAddRequest.getAbortion(); + String abortion = String.valueOf(antExcAddRequest.getAbortion()); //孕产史高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); + if (CollectionUtils.isNotEmpty(items)) { //流产次 - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.LCC.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(),item.getValueThree(),abortion) && CollectionUtils.isNotEmpty(item.getRiskIds())) @@ -2793,13 +2793,13 @@ public class AntenatalExaminationFacade { if (antExcAddRequest.getProdTime() != null) { - Double prodTime = (double)antExcAddRequest.getProdTime(); + String prodTime = String.valueOf(antExcAddRequest.getProdTime()); //孕产史高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); + if (CollectionUtils.isNotEmpty(items)) { //产次 - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.CC.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(),item.getValueThree(),prodTime) && CollectionUtils.isNotEmpty(item.getRiskIds())) @@ -2813,13 +2813,13 @@ public class AntenatalExaminationFacade { if (antExcAddRequest.getYinchan() != null) { - Double yinchan = (double)antExcAddRequest.getYinchan(); + String yinchan = String.valueOf(antExcAddRequest.getYinchan()); //孕产史高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); + if (CollectionUtils.isNotEmpty(items)) { //引产次 - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YCC.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(),item.getValueThree(),yinchan) && CollectionUtils.isNotEmpty(item.getRiskIds())) @@ -2833,13 +2833,13 @@ public class AntenatalExaminationFacade { if (antExcAddRequest.getPlanedProd() != null) { - Double planedProd = (double)antExcAddRequest.getPlanedProd(); + String planedProd = String.valueOf(antExcAddRequest.getPlanedProd()); //孕产史高危匹配 - List detailItemsAge = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); - if (CollectionUtils.isNotEmpty(detailItemsAge)) + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ycs.getId()); + if (CollectionUtils.isNotEmpty(items)) { //剖宫产次 - for (DiagnoseItemModel item : detailItemsAge) + for (DiagnoseItemModel item : items) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.PGCC.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(),item.getValueThree(),planedProd) && CollectionUtils.isNotEmpty(item.getRiskIds())) @@ -2970,11 +2970,356 @@ public class AntenatalExaminationFacade { } + if (StringUtils.isNotEmpty(antExcAddRequest.getXhdb())) + { + String xhdb = antExcAddRequest.getXhdb(); + //辅助检查——血常规 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xcg.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //血红蛋白 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XHDB.getId()).equals(item.getValueOne()) && + compare(item.getValueOne(), item.getValueTwo(), xhdb) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getBxbjs())) + { + String bxbjs = antExcAddRequest.getBxbjs(); + //辅助检查——血常规 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xcg.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //白细胞计数 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.BXBJS.getId()).equals(item.getValueOne()) && + compare(item.getValueOne(), item.getValueTwo(), bxbjs) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getPlatelet())) + { + //辅助检查——血常规 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xcg.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //血小板计数 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XXBJX.getId()).equals(item.getValueOne()) && + compare(item.getValueOne(), item.getValueTwo(), antExcAddRequest.getPlatelet()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getRh())) + { + String rh = antExcAddRequest.getRh(); + if("yang".equals(rh)) + { + // 辅助检查——血型 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xx.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //阳性 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.RHXX.getId()).equals(item.getValueOne()) && + CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getBloodSugar())) + { + // 辅助检查——血型 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xx.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //血糖 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XT.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getBloodSugar()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + + if (StringUtils.isNotEmpty(antExcAddRequest.getXqgbzam())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //血清谷丙转氨酶 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XQGBZAM.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXqgbzam()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getXqgczam())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //血清谷草转氨酶 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XQGCZAM.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXqgczam()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getAlbumin())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //白蛋白 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.BDB.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getAlbumin()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getTotalBilirubin())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //总胆红素 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.ZDHS.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getTotalBilirubin()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getJhBilirubin())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //结合胆红素 + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.JHDHS.getId()).equals(item.getValueOne()) && + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getJhBilirubin()) && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getBg())) + { + if ("yang".equals(antExcAddRequest.getBg())) + { + // 辅助检查——肝功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + if (CollectionUtils.isNotEmpty(items)) + { + //丙肝——阳性（+） + for (DiagnoseItemModel item : items) + { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.GGNBG.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmky())) + { + if ("yang".equals(antExcAddRequest.getYgbmky())) { + // 辅助检查——乙肝五项 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ygwx.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //乙肝表面抗原——阳性（+） + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGBMKY.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmkt())) + { + if ("yang".equals(antExcAddRequest.getYgbmkt())) { + // 辅助检查——乙肝五项 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ygwx.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //乙肝表面抗体——阳性（+） + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGBMKT.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getYgeky())) + { + if ("yang".equals(antExcAddRequest.getYgeky())) { + // 辅助检查——乙肝五项 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ygwx.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //乙肝e抗原——阳性（+） + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKY.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getYgekt())) + { + if ("yang".equals(antExcAddRequest.getYgekt())) { + // 辅助检查——乙肝五项 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ygwx.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //乙肝e抗体——阳性（+） + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKY.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + + if (StringUtils.isNotEmpty(antExcAddRequest.getYghxkt())) + { + if ("yang".equals(antExcAddRequest.getYghxkt())) { + // 辅助检查——乙肝五项 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ygwx.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //乙肝核心抗体——阳性（+） + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGHXKT.getId()).equals(item.getValueOne()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + } + + if (StringUtils.isNotEmpty(antExcAddRequest.getXqjq())) + { + // 辅助检查——肾功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.sgn.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //血清肌酐 + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XQJG.getId()).equals(item.getValueOne()) + && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXqjq()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + + if (StringUtils.isNotEmpty(antExcAddRequest.getXnsd())) + { + // 辅助检查——肾功能 + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.sgn.getId()); + if (CollectionUtils.isNotEmpty(items)) { + //血尿素氮 + for (DiagnoseItemModel item : items) { + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XNSD.getId()).equals(item.getValueOne()) + && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXnsd()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { + list.addAll(item.getRiskIds()); + } + } + } + } + + } - List> riskList = diagnoseConfigFacde.getRiskName(list); + + + + + + + List> riskList = diagnoseConfigFacde.getRiskName(list); return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -2985,7 +3330,6 @@ public class AntenatalExaminationFacade { return content.contains(value); } - /** * * @param expId 表达式id @@ -2993,28 +3337,37 @@ public class AntenatalExaminationFacade { * @param calValue 被计算值 * @return */ - private boolean compare(String expId,String value,Double calValue) + private boolean compare(String expId,String value,String calValue) { - Integer id = Integer.parseInt(expId); - switch (id) + try { - case 1 : - return calValue > Double.parseDouble(value); - case 2 : - return calValue >= Double.parseDouble(value); - case 3 : - return calValue < Double.parseDouble(value); - case 4 : - return calValue <= Double.parseDouble(value) ; - case 5 : - return calValue == Double.parseDouble(value); - case 6 : - return Double.parseDouble(value) != calValue; - default: return false; + Double compareValue = Double.parseDouble(calValue); + + Integer id = Integer.parseInt(expId); + switch (id) + { + case 1 : + return compareValue > Double.parseDouble(value); + case 2 : + return compareValue >= Double.parseDouble(value); + case 3 : + return compareValue < Double.parseDouble(value); + case 4 : + return compareValue <= Double.parseDouble(value) ; + case 5 : + return compareValue == Double.parseDouble(value); + case 6 : + return compareValue != Double.parseDouble(value); + default: return false; + } + }catch (Exception e) + { + ExceptionUtils.catchException(e,"risk compare error"); } + return false; } - private boolean compare(DiagnoseItemModel item,Double calValue) + private boolean compare(DiagnoseItemModel item,String calValue) { String expId1 = item.getValueOne(); String value1 = item.getValueTwo(); -- 1.8.3.1