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 13e7f9f..73d9683 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 @@ -168,7 +168,7 @@ public class FunvCommonUtil { content.put("jsjbs", "精神疾病史"); content.put("xtjx", "先天畸形"); content.put("xtyx", "先天愚型"); - content.put("ny", "聋哑"); + content.put("ly", "聋哑"); content.put("mr", "盲人"); content.put("cel", "唇腭裂"); content.put("xyb", "血友病"); @@ -177,27 +177,66 @@ public class FunvCommonUtil { content.put("st", "双胎"); content.put("gb", "肝病"); content.put("jh", "结核"); + content.put("gxy", "高血压"); + content.put("tnb", "糖尿病"); content.put("xy", "吸烟"); content.put("yj", "饮酒"); content.put("fyyw", "服用药物"); - content.put("jcydyhwz", "接触有毒有害物质"); + content.put("jcydwz", "接触有毒有害物质"); content.put("jcfsx", "接触放射线"); + content.put("fzym", "风疹疫苗"); + content.put("ygym", "乙肝疫苗"); + content.put("mzym", "麻疹疫苗"); + content.put("psfym", "破伤风疫苗"); + content.put("qmsgm", "青霉素过敏"); content.put("xfmsgm", "先锋霉素过敏"); - content.put("halywgm", "磺胺类药物过敏"); + content.put("halyw", "磺胺类药物过敏"); + content.put("tb", "头孢"); + + content.put("pgc", "剖宫产"); + content.put("zgjlbc", "子宫肌瘤剥除"); + content.put("lwqc", "阑尾切除"); + content.put("ywrsss", "异位妊娠手术"); + + content.put("yq1", "孕前1个月"); + content.put("yq2", "孕前2个月"); + content.put("yq3", "孕前3个月"); + content.put("yzq1", "孕早期1个月"); + content.put("yzq2", "孕早期2个月"); + content.put("yzq3", "孕早期3个月"); + + content.put("ex", "恶心"); + content.put("ot", "呕吐"); + content.put("yh", "眼花"); + content.put("xm", "胸闷"); + content.put("fz", "浮肿"); + content.put("ydcx", "阴道出血"); + content.put("ft", "腹痛"); + content.put("tt", "头痛"); + content.put("ft", "腹痛"); jiwangshicontent.put("26cac65c-a040-4898-b7da-8deed3ba0ec3", "循环系统类"); jiwangshicontent.put("b26889c5-d2a7-4ae1-af32-84f92440e05f", "呼吸系统类"); jiwangshicontent.put("e6e5daab-5912-4465-91dc-030263c7f4c2", "泌尿系统类"); jiwangshicontent.put("7d0c5625-966b-46cc-8642-6567b18f65a0", "消化系统类"); jiwangshicontent.put("d5de523a-9243-4eeb-9849-15fcf7d55f15", "代谢营养类"); + jiwangshicontent.put("fc5d5131-2fdc-4340-a26e-479efbca9e4d", "内分泌系统类"); + jiwangshicontent.put("efeae2f4-13ea-4c7d-a7b5-5e50ef3a0978", "血液系统类"); jiwangshicontent.put("57e4bedbf0f0baa1bee496cd", "其他"); } private static final String YES_OR_NO = "yesOrNo"; + /** + * 解析病史方法(注意:逗号使用的是中文逗号) + * @param map + * @param sb + * @param basicConfigService + * @return + */ public static String replace(Map map, StringBuilder sb,BasicConfigService basicConfigService) { if (null == map) { return null; @@ -212,7 +251,7 @@ public class FunvCommonUtil { } if ("true".equals(ma.getValue() + "")) { if (content.containsKey(ma.getKey())) { - sb.append(content.get(ma.getKey())).append(','); + sb.append(content.get(ma.getKey())).append('，'); } } if (jiwangshicontent.containsKey(ma.getKey())){ @@ -257,10 +296,10 @@ public class FunvCommonUtil { for (String id : ids){ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); if (basicConfig!=null){ - sb.append(basicConfig.getName()).append(","); + sb.append(basicConfig.getName()).append("，"); } } - if (sb.toString().endsWith(",")) { + if (sb.toString().endsWith("，")) { String ss = sb.substring(0, sb.length() - 1); sb = new StringBuilder(ss); } @@ -277,7 +316,7 @@ public class FunvCommonUtil { if (map.containsKey("qtText")) { sb.append(map.get("qtText")); } - if (sb.toString().endsWith(",")) { + if (sb.toString().endsWith("，")) { return sb.substring(0, sb.length() - 1); } } else if ("no".equals(map.get(YES_OR_NO))) { 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 index feaefb7..9c6a4d5 100644 --- 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.pojo.BasicConfig; @@ -334,6 +335,17 @@ public class ResolveUtils { return mapList; } + //返回孕周(需要计算) + public static String getPregnancyWeek(Date start,Date end){ + + int day = DateUtil.daysBetween(start,end); + + if (day==-1){ + return ""; + } + + return com.lyms.platform.common.utils.StringUtils.dueWeek(day); + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java index 9d97cd5..9a8773c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java @@ -16,7 +16,7 @@ public class UnitConstants { public static final String MMOLL = " mmol/L"; public static final String CI = " 次"; public static final String UL = " U/L"; - public static final String TEN_LKG = " 10^9/Lkg"; + public static final String TEN_LKG = " 10^9/L"; public static final String UMOLL = " umol/L"; public static final String ZHEN = " 针"; public static final String ML = " ml";