From b4f010ca248d717e0028cfefb8434f36b07385b6 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 12 Apr 2018 16:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E3=80=81=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=9A=90=E8=97=8F=E5=A7=93=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E3=80=81=E5=B1=85=E4=BD=8F=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/utils/StringUtils.java | 149 ++++++++++++++------- .../java/com/lyms/platform/beans/SerialIdEnum.java | 3 +- .../web/facade/AntenatalExaminationFacade.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 23 ++-- .../platform/operate/web/facade/PatientFacade.java | 26 +++- 5 files changed, 138 insertions(+), 65 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index dd0f4f0..0336be2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -46,7 +46,7 @@ public final class StringUtils { int week = (days / 7); String str = ""; // if (week > 0) { - str = week + "周"; + str = week + "周"; // } int day = (days % 7); return "孕" + str + (day > 0 ? "+" + day + "天" : ""); @@ -65,27 +65,35 @@ public final class StringUtils { Integer integer=NumberUtils.toInt(babyWeight); return ((Double)integer/1000)+""; }*/ - /* */ + /* */ int index = babyWeight.indexOf('.'); - if(index>-1){ - babyWeight = babyWeight.substring(0,index); + if (index > -1) { + babyWeight = babyWeight.substring(0, index); } - if(babyWeight.length()>=4 &&index>-1 &&index<5){ - babyWeight=babyWeight.substring(0,4); + if (babyWeight.length() >= 4 && index > -1 && index < 5) { + babyWeight = babyWeight.substring(0, 4); } if (babyWeight.length() <= 3) { babyWeight = org.apache.commons.lang.StringUtils.leftPad(babyWeight, 4, "0"); } StringBuilder stringBuilder = new StringBuilder(babyWeight); - if (babyWeight.length() > 2) { + if (babyWeight.length() > 2) { stringBuilder.setLength(babyWeight.length() - 1); } stringBuilder.insert(stringBuilder.length() - 2, "."); return stringBuilder.toString(); } + public static boolean contains(String str, String searchStr) { + if (str != null && searchStr != null) { + return str.indexOf(searchStr) >= 0; + } else { + return false; + } + } + public static Object isEmpty(Object obj, Object defaultVal) { if (null == obj) { return defaultVal; @@ -136,9 +144,9 @@ public final class StringUtils { return new String(res); - }else{ + } else { for (int i = 0; i < chars.length; i++) { - if (2 < i && i < chars.length-2) { + if (2 < i && i < chars.length - 2) { res[i] = '*'; } else { res[i] = chars[i]; @@ -151,29 +159,81 @@ public final class StringUtils { } /** + * 姓名加密 + * + * @param name + * @return + */ + public static String encryName(String name) { + if (isNotEmpty(name)) { + char[] res = new char[name.length()]; + char[] chars = name.toCharArray(); + if (chars != null && chars.length > 1) { + for (int i = 0; i < chars.length; i++) { + if (i > 0) { + res[i] = '*'; + } else { + res[i] = chars[i]; + } + } + return new String(res); + } + } + return name; + } + + /** + * 户籍地或居住地加密 + * + * @param addr + * @return + */ + public static String encryAddr(String addr) { + if (isNotEmpty(addr)) { + char[] res = new char[addr.length()]; + char[] chars = addr.toCharArray(); + if (addr.indexOf("市") != -1) { + if (chars != null && chars.length > 1) { + for (int i = 0; i <= addr.indexOf("市"); i++) { + res[i] = addr.charAt(i); + } + + for (int i = addr.indexOf("市")+1; i < chars.length; i++) { + res[i] = '*'; + } + return new String(res); + } + } else { + return addr; + } + } + return addr; +} + + /** * 证件号加密处理 + * * @param id * @return */ public static String encryCardNo(String id) { if (org.apache.commons.lang.StringUtils.isEmpty(id)) { return ""; - }else if (id.length() == 11) { + } else if (id.length() == 11) { return id.substring(0, 3) + "****" + id.substring(7); - }else if (id.length() == 15) { + } else if (id.length() == 15) { return id.substring(0, 6) + "****" + id.substring(10, 13) + "*" + id.substring(14); - }else if (id.length() == 18) { + } else if (id.length() == 18) { return id.substring(0, 6) + "******" + id.substring(12, 15) + "**" + id.substring(17); - }else if(id.length()<11){ + } else if (id.length() < 11) { return id; - }else{ - return id.substring(0, 3) + "****" + id.substring(7)+"**"; + } else { + return id.substring(0, 3) + "****" + id.substring(7) + "**"; } } - public static Date getBirthDay(String idCard){ - if (isEmpty(idCard)) - { + public static Date getBirthDay(String idCard) { + if (isEmpty(idCard)) { return null; } String year = idCard.substring(6, 10); @@ -184,29 +244,23 @@ public final class StringUtils { } - public static String emptyDeal(String str) - { - if (isEmpty(str)) - { + public static String emptyDeal(String str) { + if (isEmpty(str)) { return "-"; } return str; } - public static String emptyStr(String str) - { - if (str == null) - { + public static String emptyStr(String str) { + if (str == null) { return ""; } return str; } - public static String emptyInt(Integer str) - { - if (str == null) - { + public static String emptyInt(Integer str) { + if (str == null) { return ""; } return String.valueOf(str); @@ -215,46 +269,39 @@ public final class StringUtils { /** * 替换短信中的表达式 + * * @return */ - public static String replaceEL(String name,Date checkDate,String repalceStr) - { - if (StringUtils.isNotEmpty(repalceStr)) - { + public static String replaceEL(String name, Date checkDate, String repalceStr) { + if (StringUtils.isNotEmpty(repalceStr)) { String date = DateUtil.getyyyy_MM_dd(checkDate); - return repalceStr.replace("{{姓名}}",name).replace("{{预产期}}", date); + return repalceStr.replace("{{姓名}}", name).replace("{{预产期}}", date); } return repalceStr; } - public static String replaceName(String name,String repalceStr) - { - if (StringUtils.isNotEmpty(repalceStr)) - { + public static String replaceName(String name, String repalceStr) { + if (StringUtils.isNotEmpty(repalceStr)) { return repalceStr.replace("{{姓名}}", name); } return repalceStr; } - public static String replaceBaby(String name,Date birth,String repalceStr) - { - if (StringUtils.isNotEmpty(repalceStr)) - { + public static String replaceBaby(String name, Date birth, String repalceStr) { + if (StringUtils.isNotEmpty(repalceStr)) { String date = DateUtil.getyyyy_MM_dd(birth); - return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}", date); + return repalceStr.replace("{{姓名}}", name).replace("{{出生日期}}", date); } return repalceStr; } - public static String unitHandle(String value,String unit) - { - if (org.apache.commons.lang.StringUtils.isNotEmpty(value)) - { - return value+ unit; + public static String unitHandle(String value, String unit) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(value)) { + return value + unit; } - return ""; + return ""; } public static List covertToList(String s, Class clazz) { @@ -262,7 +309,7 @@ public final class StringUtils { if (isNotEmpty(s)) { String[] values = s.split(","); for (String value : values) { - if(isNotEmpty(value)){ + if (isNotEmpty(value)) { list.add((T) value); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index d88d806..f59cf6b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -64,7 +64,8 @@ public enum SerialIdEnum { TrackDown("TrackDown", 97222333112L), last("last", 97531009990L), DiagnoseConfigModel("DiagnoseConfigModel", 97531039990L), - DiagnoseItemModel("DiagnoseConfigModel", 97531039590L); + DiagnoseItemModel("DiagnoseItemModel", 97531039590L), + CancerScreeningModel("CancerScreeningModel", 97531039591L); private String cname; private Long cid; private SerialIdEnum(String cname, Long cid) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 881f45f..404c20d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -932,7 +932,6 @@ public class AntenatalExaminationFacade { //获取所有的建档记录 List list = patientsService.queryPatient(patientsQuery); AntexListResult antexListResult = new AntexListResult(); - Map map = new HashMap(); List sortList = new ArrayList(); @@ -951,6 +950,7 @@ public class AntenatalExaminationFacade { antexListResult.setData(sortList); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); + // Map map = new HashMap(); // MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); // matDeliverQuery.setPid(list.get(0).getPid()); // matDeliverQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index a1ec6f1..eca3c86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1930,6 +1930,15 @@ public class BabyBookbuildingFacade { List hospitalIdList = new ArrayList<>(); String hospitalName = ""; + String hospitalId = ""; + //得到当前登录的医院id + if (userId != null) { + Users dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } + BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(request.getQueryNo()); if(String.valueOf("true").equals(request.getIsArea())){ @@ -1982,14 +1991,6 @@ public class BabyBookbuildingFacade { hospitalIdList.addAll(permissions); } }else{ - String hospitalId = ""; - //得到当前登录的医院id - if (userId != null) { - Users dbuser = usersService.getUsers(userId); - if (dbuser != null) { - hospitalId = String.valueOf(dbuser.getOrgId()); - } - } hospitalIdList.add(hospitalId); hospitalName = organizationService.getOrganization(Integer.valueOf(hospitalId)).getName(); } @@ -2029,6 +2030,12 @@ public class BabyBookbuildingFacade { } } } + if("216".equals(hospitalId)){ + for(BabyManageListResult result:list){ + result.setBabyName(StringUtils.encryName(result.getBabyName())); + result.setCompleteAddress(StringUtils.encryAddr(result.getCompleteAddress())); + } + } BaseListResponse objectResponse = new BaseListResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setData(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2382933..2858ede 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -26,7 +26,6 @@ import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DataPermissionsModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -97,8 +96,6 @@ public class PatientFacade { private MongoTemplate mongoTemplate; - - /** * 修改产妇的社区 * @@ -615,7 +612,7 @@ public class PatientFacade { stopWatch.stop(); logger.info(stopWatch.toString()); - List data = new ArrayList<>(); + List data = new ArrayList(); if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { @@ -628,6 +625,27 @@ public class PatientFacade { data = convertToQuanCPatient(patientses, userId, hospital); } } + if ("216".equals(hospital)) {//隐藏 + for (Object result : data) { + if (result instanceof RiskPatientsResult) { + RiskPatientsResult riskResult = (RiskPatientsResult) result; + riskResult.setName(StringUtils.encryName(riskResult.getName())); + riskResult.setAddr(StringUtils.encryAddr(riskResult.getAddr())); + riskResult.setRegisterAddr(StringUtils.encryAddr(riskResult.getRegisterAddr())); + } else if (result instanceof QuanPatientsResult) { + QuanPatientsResult quanResult = (QuanPatientsResult) result; + quanResult.setName(StringUtils.encryName(quanResult.getName())); + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); + } else if (result instanceof QuanChanResult) { + QuanChanResult quanResult = (QuanChanResult) result; + quanResult.setName(StringUtils.encryName(quanResult.getName())); + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); + } + } + } + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); } -- 1.8.3.1