From d8cb7a63086daeba29a96172a09e8d77fc0d68a9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 9 Mar 2017 17:09:14 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/operate/web/Test.java | 82 +++-- .../platform/operate/web/facade/ViewFacade.java | 334 ++++++++++++++++++--- .../platform/operate/web/utils/FunvCommonUtil.java | 9 + 3 files changed, 355 insertions(+), 70 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index eb86f8e..5a529bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -8,6 +8,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.*; import org.apache.commons.lang.*; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.*; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -41,37 +42,60 @@ public class Test { // System.out.print("5878388d0cf235c11f845399".length()); - String str = "{\"yesOrNo\":\"yes\",\"26cac65c-a040-4898-b7da-8deed3ba0ec3\":{\"checkBox\":true,\"proName\":\"循环系统类\",\"selected\":[\"6c46f0c0-97f1-4b72-a11c-98eacfff9a8f\",\"3beb4592-0fda-4041-b148-97d315fccb94\",\"87f35a26-379d-4a05-8ab8-01e634835474\",\"17e9c0ff-92e6-4f48-9f02-264711a8689d\",\"fd51e86b-d3ef-4b38-9dc3-174cf5431855\",\"f14e3084-2ad5-4e25-a634-196e96949ef3\",\"f9acf716-50b0-4b45-bebc-9d21983c616f\",\"31f9dcd6-d7f0-42b5-bd7d-72dd7fe3b01a\",\"322ad477-8130-46d0-a67c-de1b4dc9c640\",\"e7582017-b94c-46ed-b7fd-e36c747da13a\",\"04f8bb8b-f074-41bc-8f41-d3bedb65874b\"]},\"57e4bedbf0f0baa1bee496cd\":{\"checkBox\":true,\"proName\":\"其他\",\"selected\":\"其他既往史\"}}"; + System.out.println("abacb".indexOf(",")); + System.out.println("abacb".substring(0,"abacb".indexOf(","))); - //既往史 - String pastHistory = ""; - if (org.apache.commons.lang.StringUtils.isNotEmpty(str)) - { - Map map = JsonUtil.str2Obj(str, Map.class); - String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); - if ("no".equals(yesOrNo)) - { - pastHistory = "无"; - } - else if ("yes".equals(yesOrNo)) - { - - for(Object key : map.keySet()) - { - Object obj = map.get(key); - if (obj != null && !"yes".equals(obj.toString())) - { - System.out.println(obj.toString()); -// Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class); -// if (itemMap != null && itemMap.size() > 0) +// String str = "{\"yesOrNo\":\"yes\",\"26cac65c-a040-4898-b7da-8deed3ba0ec3\":{\"checkBox\":true,\"proName\":\"循环系统类\",\"selected\":[\"6c46f0c0-97f1-4b72-a11c-98eacfff9a8f\",\"3beb4592-0fda-4041-b148-97d315fccb94\",\"87f35a26-379d-4a05-8ab8-01e634835474\",\"17e9c0ff-92e6-4f48-9f02-264711a8689d\",\"fd51e86b-d3ef-4b38-9dc3-174cf5431855\",\"f14e3084-2ad5-4e25-a634-196e96949ef3\",\"f9acf716-50b0-4b45-bebc-9d21983c616f\",\"31f9dcd6-d7f0-42b5-bd7d-72dd7fe3b01a\",\"322ad477-8130-46d0-a67c-de1b4dc9c640\",\"e7582017-b94c-46ed-b7fd-e36c747da13a\",\"04f8bb8b-f074-41bc-8f41-d3bedb65874b\"]},\"57e4bedbf0f0baa1bee496cd\":{\"checkBox\":true,\"proName\":\"其他\",\"selected\":\"其他既往史\"}}"; +// +// //既往史 +// String pastHistory = ""; +// if (org.apache.commons.lang.StringUtils.isNotEmpty(str)) +// { +// Map map = JsonUtil.jkstr2Obj(str, Map.class); +// String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); +// if ("no".equals(yesOrNo)) +// { +// pastHistory = "无"; +// } +// else if ("yes".equals(yesOrNo)) +// { +// +// for(Object key : map.keySet()) +// { +// Object obj = map.get(key); +// if (obj != null && !"yes".equals(obj.toString())) +// { +// String item = obj.toString().substring(1).substring(0,obj.toString().length()-2); +// System.out.println(item); +// if (StringUtils.isNotEmpty(item)) // { -// String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString(); -// String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString(); +// if (item.contains("selected=[") && item.contains("]")) +// { +// String selecteds = item.substring(item.indexOf("[")+1,item.indexOf("]")); +// String[] items = selecteds.split(","); +// for (int i = 0,len = items.length; i < len;i++) +// { +// String selectedId = items[i].trim(); +// } +// } +// else +// { +// String[] items = item.split(","); +// for (int i = 0,len = items.length; i < len;i++) +// { +// if (items[i].contains("selected=")) +// { +// String otherSelected = items[i].substring(items[i].indexOf("selected=")); +// otherSelected = otherSelected.substring(otherSelected.indexOf("=")+1); +// System.out.println(otherSelected); +// } +// } +// } // } - } - } - } - } - System.out.println(pastHistory); +// } +// } +// } +// } + } } 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 01dd049..bc5252f 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 @@ -1882,29 +1882,31 @@ public class ViewFacade { } else if ("yes".equals(yesOrNo)) { - String qt = map.get("qt") == null ? "" : map.get("qt").toString(); - if ("true".equals(qt)) - { - String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); - drugGllergic+=" "+qtText; - } + String qmsgm = map.get("qmsgm") == null ? "" : map.get("qmsgm").toString(); if ("true".equals(qmsgm)) { - drugGllergic+=" 青霉素过敏"; + drugGllergic+=" 青霉素过敏,"; } String halyw = map.get("halyw") == null ? "" : map.get("halyw").toString(); if ("true".equals(halyw)) { - drugGllergic+=" 磺胺类药物"; + drugGllergic+=" 磺胺类药物,"; } String xfmsgm = map.get("xfmsgm") == null ? "" : map.get("xfmsgm").toString(); if ("true".equals(xfmsgm)) { - drugGllergic+=" 先锋霉素过敏"; + drugGllergic+=" 先锋霉素过敏,"; } + String qt = map.get("qt") == null ? "" : map.get("qt").toString(); + if ("true".equals(qt)) + { + String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); + drugGllergic+=" "+qtText; + } + FunvCommonUtil.spitd(drugGllergic); } } @@ -1927,7 +1929,7 @@ public class ViewFacade { */ public BaseObjectResponse getResidentsPageById(String id) { BaseObjectResponse br = new BaseObjectResponse(); - ResidentsArchiveResult result = new ResidentsArchiveResult(); + ResidentsPageResult result = new ResidentsPageResult(); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setYn(YnEnums.YES.getId()); @@ -1946,10 +1948,10 @@ public class ViewFacade { } - private ResidentsArchiveResult getResidentsPageResult(ResidentsArchiveModel model) { + private ResidentsPageResult getResidentsPageResult(ResidentsArchiveModel model) { ResidentsPageResult result = new ResidentsPageResult(); result.setUsername(model.getUsername()); - result.setSex(SexEnum.getTextById(Integer.valueOf(model.getSex()))); + result.setSex(getBasicConfig(model.getSex())); result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirthday())); result.setCountry(getBasicConfig(model.getCountryId())); result.setNation(getBasicConfig(model.getNationId())); @@ -1957,7 +1959,7 @@ public class ViewFacade { result.setCertificateType(FunvCommonUtil.getBaseicConfigByid(model.getCertificateTypeId(), basicConfigService)); result.setCertificateNum(model.getCertificateNum()); result.setCensusType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); - result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService)); + result.setLiveType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService)); result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); result.setProfessionType(FunvCommonUtil.getBaseicConfigByid(model.getProfessionTypeId(), basicConfigService)); result.setAge(DateUtil.getAge(model.getBirthday(), new Date())); @@ -1975,14 +1977,14 @@ public class ViewFacade { result.setAddressRegister(addressRegister); result.setLiveAddress(liveAddress); //既往史 - String pastHistory = ""; - if (StringUtils.isNotEmpty(model.getPastHistory())) + StringBuffer pastHistory = new StringBuffer(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getPastHistory())) { - Map map = JsonUtil.str2Obj(model.getPastHistory(), Map.class); + Map map = JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class); String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); if ("no".equals(yesOrNo)) { - pastHistory = "无"; + pastHistory.append("无"); } else if ("yes".equals(yesOrNo)) { @@ -1990,32 +1992,279 @@ public class ViewFacade { for(Object key : map.keySet()) { Object obj = map.get(key); - if (obj != null && !"yesOrNo".equals(obj.toString())) + if (obj != null && !"yes".equals(obj.toString())) { - Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class); - if (itemMap != null && itemMap.size() > 0) + + String title = getBasicConfig(key.toString()); + pastHistory.append(title); + String item = obj.toString().substring(1).substring(0, obj.toString().length() - 2); + if (StringUtils.isNotEmpty(item)) { - String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString(); - String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString(); + if (item.contains("selected=[") && item.contains("]")) + { + String selecteds = item.substring(item.indexOf("[")+1,item.indexOf("]")); + String[] items = selecteds.split(","); + String temp = ""; + if (items != null && items.length > 0) + { + temp += " ("; + for (int i = 0,len = items.length; i < len;i++) + { + String selectedId = items[i].trim(); + String value = getBasicConfig(selectedId); + if (i != len -1) + { + temp+=value+","; + } + else + { + temp+=value; + } + } + temp += " ),"; + + pastHistory.append(temp); + } + + } + else + { + String[] items = item.split(","); + for (int i = 0,len = items.length; i < len;i++) + { + if (items[i].contains("selected=")) + { + String otherSelected = items[i].substring(items[i].indexOf("selected=")); + otherSelected = otherSelected.substring(otherSelected.indexOf("=")+1); + pastHistory.append(otherSelected); + } + } + } } } } } } + result.setPastHistory(pastHistory.toString()); + + //家族史 + String familyHistory = ""; + if (StringUtils.isNotEmpty(model.getFamilyHistory())) + { + Map map = JsonUtil.str2Obj(model.getFamilyHistory(), Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + familyHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + String qmsgm = map.get("ycxjbs") == null ? "" : map.get("ycxjbs").toString(); + if ("true".equals(qmsgm)) + { + familyHistory+=" 遗传性疾病史,"; + } + String halyw = map.get("cel") == null ? "" : map.get("cel").toString(); + if ("true".equals(halyw)) + { + familyHistory+=" 唇腭裂,"; + } + String xfmsgm = map.get("jh") == null ? "" : map.get("jh").toString(); + if ("true".equals(xfmsgm)) + { + familyHistory+=" 结核,"; + } + + String jsjbs = map.get("jsjbs") == null ? "" : map.get("jsjbs").toString(); + if ("true".equals(jsjbs)) + { + familyHistory+=" 精神疾病史,"; + } + + String xyb = map.get("xyb") == null ? "" : map.get("xyb").toString(); + if ("true".equals(xyb)) + { + familyHistory+=" 血友病,"; + } + + + String xtjx = map.get("xtjx") == null ? "" : map.get("xtjx").toString(); + if ("true".equals(xtjx)) + { + familyHistory+=" 先天畸形,"; + } - result.setPastHistory(pastHistory); + String sm = map.get("sm") == null ? "" : map.get("sm").toString(); + if ("true".equals(sm)) + { + familyHistory+=" 色盲,"; + } + String xtyx = map.get("xtyx") == null ? "" : map.get("xtyx").toString(); + if ("true".equals(xtyx)) + { + familyHistory+=" 先天愚型,"; + } + + String npx = map.get("npx") == null ? "" : map.get("npx").toString(); + if ("true".equals(npx)) + { + familyHistory+=" 牛皮癣,"; + } + + + String ly = map.get("ly") == null ? "" : map.get("ly").toString(); + if ("true".equals(ly)) + { + familyHistory+=" 聋哑,"; + } + + + String st = map.get("st") == null ? "" : map.get("st").toString(); + if ("true".equals(st)) + { + familyHistory+=" 双胎,"; + } + + + String mr = map.get("mr") == null ? "" : map.get("mr").toString(); + if ("true".equals(mr)) + { + familyHistory+=" 盲人,"; + } + + String gb = map.get("gb") == null ? "" : map.get("gb").toString(); + if ("true".equals(gb)) + { + familyHistory+=" 肝病,"; + } + + String qt = map.get("qt") == null ? "" : map.get("qt").toString(); + if ("true".equals(qt)) + { + String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); + familyHistory+=" "+qtText; + } + FunvCommonUtil.spitd(familyHistory); + } + } + + result.setFamilyHistory(familyHistory); + + //个人史 + String personalHistory =""; + if (StringUtils.isNotEmpty(model.getPersonalHistory())) + { + Map map = JsonUtil.str2Obj(model.getPersonalHistory(), Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + personalHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + String xy = map.get("xy") == null ? "" : map.get("xy").toString(); + if ("true".equals(xy)) + { + personalHistory+=" 吸烟,"; + } + String yj = map.get("yj") == null ? "" : map.get("yj").toString(); + if ("true".equals(yj)) + { + personalHistory+=" 饮酒,"; + } + String fyyw = map.get("fyyw") == null ? "" : map.get("fyyw").toString(); + if ("true".equals(fyyw)) + { + personalHistory+=" 服用药物,"; + } + + String jcydwz = map.get("jcydwz,") == null ? "" : map.get("jcydwz").toString(); + if ("true".equals(jcydwz)) + { + personalHistory+=" 接触有毒有害物质,"; + } + + String jcfsx = map.get("jcfsx") == null ? "" : map.get("jcfsx").toString(); + if ("true".equals(jcfsx)) + { + personalHistory+=" 接触放射线,"; + } + + String qt = map.get("qt") == null ? "" : map.get("qt").toString(); + if ("true".equals(qt)) + { + String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); + personalHistory+=" "+qtText; + } + + FunvCommonUtil.spitd(familyHistory); + } + } + + result.setPersonalHistory(personalHistory); + + + //药物过敏史 + String ywgmHistory = ""; + + if (StringUtils.isNotEmpty(model.getYwgmHistory())) + { + Map map = JsonUtil.str2Obj(model.getYwgmHistory(), Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + ywgmHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + + + String qmsgm = map.get("qmsgm") == null ? "" : map.get("qmsgm").toString(); + if ("true".equals(qmsgm)) + { + ywgmHistory+=" 青霉素过敏,"; + } + String halyw = map.get("halyw") == null ? "" : map.get("halyw").toString(); + if ("true".equals(halyw)) + { + ywgmHistory+=" 磺胺类药物,"; + } + String xfmsgm = map.get("xfmsgm") == null ? "" : map.get("xfmsgm").toString(); + if ("true".equals(xfmsgm)) + { + ywgmHistory+=" 先锋霉素过敏,"; + } + + String qt = map.get("qt") == null ? "" : map.get("qt").toString(); + if ("true".equals(qt)) + { + String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); + ywgmHistory+=" "+qtText; + } + FunvCommonUtil.spitd(familyHistory); + } + } + result.setYwgmHistory(ywgmHistory); + + //现病史 + String presentHistory = ""; + if (StringUtils.isNotEmpty(model.getPresentHistory())) + { + Map map = JsonUtil.str2Obj(model.getPresentHistory(), Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + presentHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); + presentHistory+=qtText; + } + } + result.setPresentHistory(presentHistory); -// //既往史 -// private String pastHistory; -// //家族史 -// private String familyHistory; -// //个人史 -// private String personalHistory; -// //药物过敏史 -// private String ywgmHistory; -// //现病史 -// private String presentHistory; result.setVcCardNo(model.getVcCardNo()); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBuildDoctor())) { @@ -2024,20 +2273,23 @@ public class ViewFacade { } else { - Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())); - if (users!=null && users.getYn()==YnEnums.YES.getId()){ - String name = users.getName(); - result.setBuildDoctor(name); + try { + Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + String name = users.getName(); + result.setBuildDoctor(name); + } + } catch (Exception e) + { + result.setBuildDoctor(model.getBuildDoctor()); } + } } result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDay())); result.setId(model.getId()); - - - - return null; + return result; } } 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 2cd3472..4b1deb6 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 @@ -455,5 +455,14 @@ public class FunvCommonUtil { return ""; } + public static String spitd(String str) + { + if(str.indexOf(",") > 0) + { + return str.substring(0, str.indexOf(",")); + } + return str; + } + } -- 1.8.3.1