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 63722e5..9df273c 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 @@ -70,4 +70,34 @@ public final class StringUtils { } return false; } + + public static String encryPhone(String phone) + { + if (isNotEmpty(phone)) + { + char[] res = new char[11]; + char[] chars =phone.toCharArray(); + if (chars != null && chars.length == 11) + { + for(int i = 0 ; i 0) { Patients p = patients.get(0); - result.setId(p.getId()); - /**********孕妇基本信息***************/ - result.setPregnantName(p.getUsername()); - result.setPregnantCertificateTypeId(p.getPcerteTypeId()); - result.setPregnantCertificateNum(p.getCardNo()); - result.setPregnantCountryId(p.getPcountryId()); - result.setPregnantNationId(p.getPnationId()); - result.setBirthday(DateUtil.getyyyy_MM_dd(p.getBirth())); - result.setPregnantCensusTypeId(p.getPcensusTypeId()); - result.setPregnantLiveTypeId(p.getPliveTypeId()); - result.setPregnantProfessionTypeId(p.getPprofessionTypeId()); - result.setPregnantLevelTypeId(p.getPlevelTypeId()); - - /**********孕妇联系方式***************/ - result.setPregnantPhone(p.getPhone()); - result.setPregnantWorkUnit(p.getPworkUnit()); - - result.setPregnantCensusProvinceId(p.getProvinceRegisterId()); - result.setPregnantCensusCityId(p.getCityRegisterId()); - result.setPregnantCensusAreaId(p.getAreaRegisterId()); - result.setPregnantCensusStreetId(p.getStreetRegisterId()); - result.setPregnantCensusAddr(p.getAddressRegister()); - - result.setPregnantLiveProvinceId(p.getProvinceId()); - result.setPregnantLiveCityId(p.getCityId()); - result.setPregnantLiveAreaId(p.getAreaId()); - result.setPregnantLiveStreetId(p.getStreetId()); - result.setPregnantLiveAddr(p.getAddress()); - - - result.setChildbirthAddr(p.getAddressPostRest()); - result.setChildbirthProvinceId(p.getProvincePostRestId()); - result.setChildbirthCityId(p.getCityPostRestId()); - result.setChildbirthAreaId(p.getAreaPostRestId()); - result.setChildbirthStreetId(p.getStreetPostRestId()); - - /****************丈夫信息**************/ - result.setHusbandName(p.getHusbandName()); - result.setHusbandPhone(p.getHusbandPhone()); - - result.setHusbandCertificateTypeId(p.getHcertificateTypeId()); - result.setHusbandCertificateNum(p.getHcertificateNum()); - result.setHusbandCountryId(p.getHcountryId()); - result.setHusbandNationId(p.getHnationId()); - result.setHusbandProfessionTypeId(p.getHprofessionTypeId()); - result.setHusbandWorkUnit(p.getHworkUnit()); - result.setHusbandLevelTypeId(p.getHlevelTypeId()); - - result.setHusbandAddressRegister(p.getHaddressRegister()); - result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId()); - result.setHusbandCityRegisterId(p.getHcityRegisterId()); - result.setHusbandAreaRegisterId(p.getHareaRegisterId()); - result.setHusbandStreetRegisterId(p.getHstreetRegisterId()); - - result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus())); - result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime())); - result.setExpVip(p.getExpVip()); - result.setMremark(p.getMremark()); - - - //院内信息 - result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getLastMenses())); - result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate())); - result.setFileCode(p.getFileCode()); - result.setVcCardNo(p.getVcCardNo()); - result.setBookbuildingDoctor(p.getBookbuildingDoctor()); - result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); - result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType())); - - result.setExpType(p.getExpType()); - - result.setPid(p.getPid()); + result = getResult(p); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); @@ -635,6 +564,84 @@ public class BookbuildingFacade { return objectResponse; } + + private PregnantInfoResult getResult(Patients p) + { + PregnantInfoResult result = new PregnantInfoResult(); + result.setId(p.getId()); + /**********孕妇基本信息***************/ + result.setPregnantName(p.getUsername()); + result.setPregnantCertificateTypeId(p.getPcerteTypeId()); + result.setPregnantCertificateNum(p.getCardNo()); + result.setPregnantCountryId(p.getPcountryId()); + result.setPregnantNationId(p.getPnationId()); + result.setBirthday(DateUtil.getyyyy_MM_dd(p.getBirth())); + result.setPregnantCensusTypeId(p.getPcensusTypeId()); + result.setPregnantLiveTypeId(p.getPliveTypeId()); + result.setPregnantProfessionTypeId(p.getPprofessionTypeId()); + result.setPregnantLevelTypeId(p.getPlevelTypeId()); + + /**********孕妇联系方式***************/ + result.setPregnantPhone(p.getPhone()); + result.setPregnantWorkUnit(p.getPworkUnit()); + + result.setPregnantCensusProvinceId(p.getProvinceRegisterId()); + result.setPregnantCensusCityId(p.getCityRegisterId()); + result.setPregnantCensusAreaId(p.getAreaRegisterId()); + result.setPregnantCensusStreetId(p.getStreetRegisterId()); + result.setPregnantCensusAddr(p.getAddressRegister()); + + result.setPregnantLiveProvinceId(p.getProvinceId()); + result.setPregnantLiveCityId(p.getCityId()); + result.setPregnantLiveAreaId(p.getAreaId()); + result.setPregnantLiveStreetId(p.getStreetId()); + result.setPregnantLiveAddr(p.getAddress()); + + + result.setChildbirthAddr(p.getAddressPostRest()); + result.setChildbirthProvinceId(p.getProvincePostRestId()); + result.setChildbirthCityId(p.getCityPostRestId()); + result.setChildbirthAreaId(p.getAreaPostRestId()); + result.setChildbirthStreetId(p.getStreetPostRestId()); + + /****************丈夫信息**************/ + result.setHusbandName(p.getHusbandName()); + result.setHusbandPhone(p.getHusbandPhone()); + + result.setHusbandCertificateTypeId(p.getHcertificateTypeId()); + result.setHusbandCertificateNum(p.getHcertificateNum()); + result.setHusbandCountryId(p.getHcountryId()); + result.setHusbandNationId(p.getHnationId()); + result.setHusbandProfessionTypeId(p.getHprofessionTypeId()); + result.setHusbandWorkUnit(p.getHworkUnit()); + result.setHusbandLevelTypeId(p.getHlevelTypeId()); + + result.setHusbandAddressRegister(p.getHaddressRegister()); + result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId()); + result.setHusbandCityRegisterId(p.getHcityRegisterId()); + result.setHusbandAreaRegisterId(p.getHareaRegisterId()); + result.setHusbandStreetRegisterId(p.getHstreetRegisterId()); + + result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus())); + result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime())); + result.setExpVip(p.getExpVip()); + result.setMremark(p.getMremark()); + + + //院内信息 + result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getLastMenses())); + result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate())); + result.setFileCode(p.getFileCode()); + result.setVcCardNo(p.getVcCardNo()); + result.setBookbuildingDoctor(p.getBookbuildingDoctor()); + result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); + result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType())); + + result.setExpType(p.getExpType()); + + result.setPid(p.getPid()); + } + /** * 孕妇建档页面基础数据 * @return @@ -733,7 +740,7 @@ public class BookbuildingFacade { } else { - objectResponse.setData(pat); + objectResponse.setData(getResult(pat)); } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index f831193..c8dafb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -24,6 +24,9 @@ public class BabyManageListResult { //母亲联系方式 private String mommnyPhone; + //母亲加密联系方式 + private String mommnyEncryptPhone; + //下次儿保时间 private String nextDate; @@ -39,6 +42,14 @@ public class BabyManageListResult { //诊断 private String diagnose; + public String getMommnyEncryptPhone() { + return mommnyEncryptPhone; + } + + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { + this.mommnyEncryptPhone = mommnyEncryptPhone; + } + public String getDiagnose() { return diagnose; }