diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index bd30648..a90bd73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -436,7 +436,7 @@ public class LhBabyEyeCheckFacade { } Map map=dioptricAnomalyState(babyCheck); if((Boolean) map.get("state")){ - abnormalInfo+="屈光异常值:"+map.get("value"); + abnormalInfo+=""+map.get("value"); }else{ abnormalInfo+="无"; } @@ -454,37 +454,72 @@ public class LhBabyEyeCheckFacade { Map map=new HashMap<>(); map.put("state",false); map.put("value",""); +// System.out.println(babyCheck.getQgscResult().get("yesOrNo")); +// System.out.println(babyCheck.getQgscResult().get("sg")); +// System.out.println(babyCheck.getQgscResult().get("js")); + StringBuilder str = new StringBuilder(); + if (babyCheck.getQgscResult()!=null){ + if (babyCheck.getQgscResult().get("yesOrNo").equals("yes") && babyCheck.getQgscResult().get("yesOrNo")!=null){ + str.append("异常"); + + }else if (babyCheck.getQgscResult().get("yesOrNo").equals("no") && babyCheck.getQgscResult().get("yesOrNo")!=null){ + str.append(""); + map.put("state",false); + map.put("value", str); + return map; + }if (babyCheck.getQgscResult().get("yesOrNo").equals("yes1") && babyCheck.getQgscResult().get("yesOrNo")!=null){ + str.append("可疑"); + + } + if(babyCheck.getQgscResult().get("sg").equals("true")){ +// str = str+"散光"; + str.append(" 散光"); + }else if(babyCheck.getQgscResult().get("js").equals("true")){ + str.append(" 近视"); + }else if(babyCheck.getQgscResult().get("rs").equals("true")){ +// str = str+"弱视"; + str.append(" 弱视 "); + }else if(babyCheck.getQgscResult().get("ys").equals("true")){ + str.append(" 远视"); + } + map.put("state",true); + map.put("value", str); + return map; + }else{ + return map; + } + //6月-1岁 - if(babyCheck.getLhdsr()!="" && babyCheck.getLhdsl()!="" &&babyCheck.getLhdcr()!="" && babyCheck.getLhdcl()!="" && - babyCheck.getLhdsr()!=null && babyCheck.getLhdsl()!=null &&babyCheck.getLhdcr()!=null && babyCheck.getLhdcl()!=null) { - if (NumberUtils.isNumber(babyCheck.getLhdsr())) { - if (1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || - 1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || - -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))) { - map.put("state", true); - map.put("value", "散光异常"); - } - } - if (NumberUtils.isNumber(babyCheck.getLhdsl())) { - if (3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) || 3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) { -// if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){ - map.put("state", true); -// map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); - map.put("value", map.get("value") + "远视异常"); - } - } - if (NumberUtils.isNumber(babyCheck.getLhdcl())) { - if (Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) < -0.5d || Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) < -0.5d) { - map.put("state", true); - map.put("value", map.get("value") + "近视异常"); - } - } - return map; - }else{ - map.put("state", false); - map.put("value", null); - return map; - } +// if(babyCheck.getLhdsr()!="" && babyCheck.getLhdsl()!="" &&babyCheck.getLhdcr()!="" && babyCheck.getLhdcl()!="" && +// babyCheck.getLhdsr()!=null && babyCheck.getLhdsl()!=null &&babyCheck.getLhdcr()!=null && babyCheck.getLhdcl()!=null) { +// if (NumberUtils.isNumber(babyCheck.getLhdsr())) { +// if (1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || +// 1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || +// -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))) { +// map.put("state", true); +// map.put("value", "散光异常"); +// } +// } +// if (NumberUtils.isNumber(babyCheck.getLhdsl())) { +// if (3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) || 3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) { +//// if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){ +// map.put("state", true); +//// map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); +// map.put("value", map.get("value") + "远视异常"); +// } +// } +// if (NumberUtils.isNumber(babyCheck.getLhdcl())) { +// if (Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) < -0.5d || Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) < -0.5d) { +// map.put("state", true); +// map.put("value", map.get("value") + "近视异常"); +// } +// } +// return map; +// }else{ +// map.put("state", false); +// map.put("value", null); +// return map; +// } } /** * 是否屈光异常