diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 16c8b8b..11fda76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1176,6 +1176,15 @@ public class ViewFacade { // private String hivktSelect; map.put("syjgSelect", StringUtils.isNotEmpty(data.getSyjgSelect())?SYJGEums.getTitle(data.getSyjgSelect()):""); map.put("hivktSelect", StringUtils.isNotEmpty(data.getHivktSelect())?SYJGEums.getTitle(data.getHivktSelect()):""); +// {\"yesOrNo\":\"yes\",\"yg\":true,\"bg\":true,\"azb\":true,\"md\":true,\"qt\":true,\"qtText\":\"bdfgsf\"} + map.put("infectDiseases", ""); + + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getInfectDiseases())) { + Map map1 = JsonUtil.jkstr2Obj(data.getInfectDiseases(), Map.class); + map.put("infectDiseases", FunvCommonUtil.reslove(map1, new StringBuilder())); + } + + //既往史 String pastHistory = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index 4b1deb6..4aa19ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -217,6 +217,10 @@ public class FunvCommonUtil { content.put("ft", "腹痛"); content.put("tt", "头痛"); content.put("ft", "腹痛"); + content.put("yg", "乙肝"); + content.put("bg", "丙肝"); + content.put("azb", "艾滋病"); + content.put("md", "梅毒"); jiwangshicontent.put("26cac65c-a040-4898-b7da-8deed3ba0ec3", "循环系统类"); jiwangshicontent.put("b26889c5-d2a7-4ae1-af32-84f92440e05f", "呼吸系统类"); @@ -230,6 +234,37 @@ public class FunvCommonUtil { private static final String YES_OR_NO = "yesOrNo"; + + public static String reslove(Map map, StringBuilder sb){ + if (null == map) { + return null; + } + if ("yes".equals(map.get(YES_OR_NO))) { + Set> m = map.entrySet(); + Iterator> it = m.iterator(); + while (it.hasNext()) { + Map.Entry ma = it.next(); + if (ma.getKey().equals(YES_OR_NO)) { + continue; + } + if ("true".equals(ma.getValue() + "")) { + if (content.containsKey(ma.getKey())) { + sb.append(content.get(ma.getKey())).append(','); + } + } + } + if (map.containsKey("qtText")) { + sb.append(map.get("qtText")); + } + if (sb.toString().endsWith(",")) { + return sb.substring(0, sb.length() - 1); + } + } else if ("no".equals(map.get(YES_OR_NO))) { + sb.append("无"); + } + return sb.toString(); + } + /** * 解析病史方法(注意:逗号使用的是中文逗号) * @param map