diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index b1527bf..39553f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -60,12 +60,18 @@ public class AntexChuResult { this.mHighRiskReason = mHighRiskReason; } - /** 处理意见 */ + /** + * 处理意见 + */ private Map>> treatmentOpinion2; private List treatmentOpinion2Types; - /** 胎动 */ + /** + * 胎动 + */ private String quicken; - /** 胎动备注 */ + /** + * 胎动备注 + */ private String quickenRemark; public String getQuicken() { @@ -99,6 +105,7 @@ public class AntexChuResult { public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { this.treatmentOpinion2Types = treatmentOpinion2Types; } + private String barCode; public String getBarCode() { @@ -641,7 +648,6 @@ public class AntexChuResult { } - public String getBld() { return bld; } @@ -804,7 +810,6 @@ public class AntexChuResult { } - public String getNcgOther() { return ncgOther; } @@ -1353,8 +1358,8 @@ public class AntexChuResult { setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class)); } catch (Exception e) { } - if(null!=antExChuModel.getBp()){ - setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class)); + if (null != antExChuModel.getBp()) { + setBp(JsonUtil.str2Obj(antExChuModel.getBp(), Map.class)); } setYaowu(antExChuModel.getYaowu()); setGongwaiyun(antExChuModel.getGongwaiyun()); @@ -1395,14 +1400,14 @@ public class AntexChuResult { setPlacentas(antExChuModel.getPlacentas()); setHighriskSocre(antExChuModel.getHighriskSocre()); //处理成支持多选操作 - if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())&& !"[]".equals(antExChuModel.getOtherHighRisk())) { + if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { if (antExChuModel.getOtherHighRisk().startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) { List list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class); for (Map map : list2) { suppleOtherHigh(map); } setOtherHighRisk(list2); - }else{ + } else { Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); suppleOtherHigh(map); setOtherHighRisk(Arrays.asList(new Object[]{map})); @@ -1413,10 +1418,10 @@ public class AntexChuResult { setTreatOpinion(antExChuModel.getTreatOpinion()); setGuide(antExChuModel.getDirOpinion()); // setProdDoctor(antExChuModel.getProdDoctor()); - if(null!=antExChuModel.getCheckTime()){ + if (null != antExChuModel.getCheckTime()) { setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); } - if(null!=antExChuModel.getNextCheckTime()){ + if (null != antExChuModel.getNextCheckTime()) { setNextCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); } setSyjg(antExChuModel.getSyjg()); @@ -1450,12 +1455,12 @@ public class AntexChuResult { setHivkt(antExChuModel.getHivkt()); setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class)); setYdqjd(antExChuModel.getYdqjd()); - if(null!=antExChuModel.getDueDate()){ + if (null != antExChuModel.getDueDate()) { setDueDate(DateUtil.getyyyy_MM_dd(antExChuModel.getDueDate())); } - if(null!=antExChuModel.getLastMenses()) { - setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses())); - } + if (null != antExChuModel.getLastMenses()) { + setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses())); + } setcDueWeek(antExChuModel.getcDueWeek()); setAbortionZR(antExChuModel.getAbortionZR()); @@ -1473,18 +1478,23 @@ public class AntexChuResult { /** * 完善自定义高危的颜色值,和分数值 + * * @param map */ - public void suppleOtherHigh(Map map){ - if(map!=null){ + public void suppleOtherHigh(Map map) { + if (map != null) { Object idObj1 = map.get("fyyse"); if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1)); + }else{ + map.remove("fyyse"); } //风险评分 Object idObj = map.get("fxpf"); if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj)); + }else{ + map.remove("fxpf"); } } }