diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index f27e634..013d299 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -129,7 +129,23 @@ public class CancerScreeningFacade { map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期 map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null)); - map.put("newRxCssj",LhUltrasoundContent.getName(null!=model.getNewRxCssj()?model.getNewRxCssj():null));//超声所见 + map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见 + map.put("rxXJc",LhBreastXRayContent.getName(StringUtils.isNotEmpty(model.getRxXJc())?model.getRxXJc():null));//隆化乳腺X钼靶检查 + //最后诊断 展示用到enum(LhEndDiagnosisContent) + StringBuilder zhJd=new StringBuilder(); + if(!model.getZhJd().isEmpty()){ + if(model.getZhJd().get("yc").toString().equals("0")){ + zhJd.append("未见异常"); + }else { + for (String yn : (List) model.getZhJd().get("yn")) { + zhJd.append(LhEndDiagnosisContent.getName(yn)+","); + if(yn.equals("9")){ + zhJd.append(model.getZhJd().get("qt"));//qt(其他注明); + } + } + } + } + map.put("zhJd",zhJd); list.add(map); }