From 39ea3298d1cc70cc7331e7580a43d8efe8f13b2b Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 11 Jan 2017 10:06:44 +0800 Subject: [PATCH] update bug --- .../lyms/platform/common/enums/FmTypeEnums.java | 23 ++++++ .../lyms/platform/common/enums/TaiShuEnums.java | 19 +++++ .../lyms/platform/query/ResidentsArchiveQuery.java | 3 + .../platform/operate/web/utils/ResolveUtils.java | 95 ++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index d77e1a7..be9f61a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -30,6 +30,29 @@ public enum FmTypeEnums { return null; } + public static String getFmNameById(String id) + { + for (FmTypeEnums e : FmTypeEnums.values()) { + if (e.getId().equals(id)) + { + return e.getName(); + } + } + return null; + } + + + public static String getFmScNameById(String id) + { + for (FmScEnums e : FmScEnums.values()) { + if (e.getId().equals(id)) + { + return e.getName(); + } + } + return null; + } + public static List getFmTypeEnums() { List list = new ArrayList<>(); for (FmTypeEnums e : FmTypeEnums.values()) { diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiShuEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiShuEnums.java index f025dc0..e4ce0a2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiShuEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiShuEnums.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import org.apache.commons.lang.StringUtils; + /** * 胎盘 * Created by Administrator on 2016/6/21 0021. @@ -54,6 +56,23 @@ public enum TaiShuEnums { this.name = name; } } + + public static String getTpNameById(String id) { + + if (StringUtils.isEmpty(id)){ + return null; + } + + for (TpEnums e : TpEnums.values()) { + if (e.getId().equals(id)) + { + return e.getName(); + } + } + return null; + } + + public enum TpEnums { O("完整","1"),O1("不完整","2"); private TpEnums(String name,String id){ diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index 9b3139f..3e6d138 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -137,6 +137,9 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (StringUtils.isNotBlank(cityId)) { condition = condition.and("cityId", cityId, MongoOper.IS); } + if (StringUtils.isNotBlank(sex)) { + condition = condition.and("sex", sex, MongoOper.IS); + } if (StringUtils.isNotBlank(areaId)) { condition = condition.and("areaId", areaId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java new file mode 100644 index 0000000..56261d2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -0,0 +1,95 @@ +package com.lyms.platform.operate.web.utils; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.utils.JsonUtil; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +/** + * Created by Administrator on 2017/1/9 0009. + */ +public class ResolveUtils { + + private static final Map content = new HashMap<>(); + + private static final String YES_OR_NO = "yesOrNo"; + + static { + content.put("qztp", "前置胎盘"); + content.put("tpzb", "胎盘早剥"); + content.put("tpzl", "胎盘滞留"); + content.put("tmzp", "胎膜早破"); + content.put("chcx", "产后出血"); + content.put("rsqgxy", "妊娠期高血压"); + content.put("zxqqq", "子痫前期(轻)"); + content.put("zxqqz", "子痫前期(重)"); + content.put("zxmxgxybfzxqq", "子痫慢性高血压并发子痫前期"); + content.put("rshbmxgxy", "妊娠合并慢性高血压"); + content.put("qt", "其他"); + } + + /** + * 解析产科并发症 + * @param map + * @return + */ + public static String replace(Map map) { + if (null == map) { + return ""; + } + StringBuilder sb = new StringBuilder(); + try { + 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(','); + } + } + } + + String bigSB = sb.toString(); + + if (bigSB.contains("其他,")){ + if (map.containsKey("qtText")){ + bigSB = bigSB.replace("其他,","其他:" + map.get("qtText")); + } + } + + if (bigSB.endsWith(",")) { + bigSB = bigSB.substring(0, bigSB.length() - 1); + } + return bigSB; + + }else if ("no".equals(map.get(YES_OR_NO))){ + return "无"; + } + + }catch (Exception e){ + e.printStackTrace(); + } + return ""; + } + + public static void main(String[] str) { + String ssss = "{\"qztp\":true,\"yesOrNo\":\"no\",\"tpzb\":true,\"zxqqz\":true,\"zxqqq\":true,\"tpzl\":true," + + "\"zxmxgxybfzxqq\":true,\"chcx\":true,\"rshbmxgxy\":true,\"tmzp\":true,\"rsqgxy\":true,\"qt\":false,\"qtText\":\"11\"}"; + + Map m = JsonUtil.str2Obj(ssss,Map.class); + + String a = replace(m); + System.out.print("哈哈.................... " + a); + } + +} -- 1.8.3.1