jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ad8aaad61659883f0bcc71a9243cf172913b41c6

Authored by liquanyu
1 parent 7dfb3b550f
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

孕妇基本信息

Showing 4 changed files with 122 additions and 73 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ ad8aaad
... ... @@ -70,5 +70,35 @@
70 70 }
71 71 return false;
72 72 }
  73 +
  74 + public static String encryPhone(String phone)
  75 + {
  76 + if (isNotEmpty(phone))
  77 + {
  78 + char[] res = new char[11];
  79 + char[] chars =phone.toCharArray();
  80 + if (chars != null && chars.length == 11)
  81 + {
  82 + for(int i = 0 ; i <chars.length ;i++ )
  83 + {
  84 + if (2 < i && i < 7)
  85 + {
  86 + res[i] = '*';
  87 + }
  88 + else
  89 + {
  90 + res[i] = chars[i];
  91 + }
  92 + }
  93 +
  94 + return new String(res);
  95 +
  96 + }
  97 + }
  98 + return "";
  99 + }
  100 +// public static void main(String[] arg) {
  101 +// System.out.print(encryPhone("18382670036"));
  102 +// }
73 103 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ad8aaad
... ... @@ -1235,6 +1235,7 @@
1235 1235 result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
1236 1236 result.setMommyName(model.getMname());
1237 1237 result.setMommnyPhone(model.getMphone());
  1238 + result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
1238 1239 result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
1239 1240 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
1240 1241 result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ ad8aaad
... ... @@ -555,84 +555,91 @@
555 555 if (patients != null && patients.size() > 0)
556 556 {
557 557 Patients p = patients.get(0);
558   - result.setId(p.getId());
559   - /**********孕妇基本信息***************/
560   - result.setPregnantName(p.getUsername());
561   - result.setPregnantCertificateTypeId(p.getPcerteTypeId());
562   - result.setPregnantCertificateNum(p.getCardNo());
563   - result.setPregnantCountryId(p.getPcountryId());
564   - result.setPregnantNationId(p.getPnationId());
565   - result.setBirthday(DateUtil.getyyyy_MM_dd(p.getBirth()));
566   - result.setPregnantCensusTypeId(p.getPcensusTypeId());
567   - result.setPregnantLiveTypeId(p.getPliveTypeId());
568   - result.setPregnantProfessionTypeId(p.getPprofessionTypeId());
569   - result.setPregnantLevelTypeId(p.getPlevelTypeId());
  558 + result = getResult(p);
  559 + }
  560 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  561 + objectResponse.setData(result);
  562 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  563 + objectResponse.setErrormsg("成功");
  564 + return objectResponse;
  565 + }
570 566  
571   - /**********孕妇联系方式***************/
572   - result.setPregnantPhone(p.getPhone());
573   - result.setPregnantWorkUnit(p.getPworkUnit());
574 567  
575   - result.setPregnantCensusProvinceId(p.getProvinceRegisterId());
576   - result.setPregnantCensusCityId(p.getCityRegisterId());
577   - result.setPregnantCensusAreaId(p.getAreaRegisterId());
578   - result.setPregnantCensusStreetId(p.getStreetRegisterId());
579   - result.setPregnantCensusAddr(p.getAddressRegister());
  568 + private PregnantInfoResult getResult(Patients p)
  569 + {
  570 + PregnantInfoResult result = new PregnantInfoResult();
  571 + result.setId(p.getId());
  572 + /**********孕妇基本信息***************/
  573 + result.setPregnantName(p.getUsername());
  574 + result.setPregnantCertificateTypeId(p.getPcerteTypeId());
  575 + result.setPregnantCertificateNum(p.getCardNo());
  576 + result.setPregnantCountryId(p.getPcountryId());
  577 + result.setPregnantNationId(p.getPnationId());
  578 + result.setBirthday(DateUtil.getyyyy_MM_dd(p.getBirth()));
  579 + result.setPregnantCensusTypeId(p.getPcensusTypeId());
  580 + result.setPregnantLiveTypeId(p.getPliveTypeId());
  581 + result.setPregnantProfessionTypeId(p.getPprofessionTypeId());
  582 + result.setPregnantLevelTypeId(p.getPlevelTypeId());
580 583  
581   - result.setPregnantLiveProvinceId(p.getProvinceId());
582   - result.setPregnantLiveCityId(p.getCityId());
583   - result.setPregnantLiveAreaId(p.getAreaId());
584   - result.setPregnantLiveStreetId(p.getStreetId());
585   - result.setPregnantLiveAddr(p.getAddress());
  584 + /**********孕妇联系方式***************/
  585 + result.setPregnantPhone(p.getPhone());
  586 + result.setPregnantWorkUnit(p.getPworkUnit());
586 587  
  588 + result.setPregnantCensusProvinceId(p.getProvinceRegisterId());
  589 + result.setPregnantCensusCityId(p.getCityRegisterId());
  590 + result.setPregnantCensusAreaId(p.getAreaRegisterId());
  591 + result.setPregnantCensusStreetId(p.getStreetRegisterId());
  592 + result.setPregnantCensusAddr(p.getAddressRegister());
587 593  
588   - result.setChildbirthAddr(p.getAddressPostRest());
589   - result.setChildbirthProvinceId(p.getProvincePostRestId());
590   - result.setChildbirthCityId(p.getCityPostRestId());
591   - result.setChildbirthAreaId(p.getAreaPostRestId());
592   - result.setChildbirthStreetId(p.getStreetPostRestId());
  594 + result.setPregnantLiveProvinceId(p.getProvinceId());
  595 + result.setPregnantLiveCityId(p.getCityId());
  596 + result.setPregnantLiveAreaId(p.getAreaId());
  597 + result.setPregnantLiveStreetId(p.getStreetId());
  598 + result.setPregnantLiveAddr(p.getAddress());
593 599  
594   - /****************丈夫信息**************/
595   - result.setHusbandName(p.getHusbandName());
596   - result.setHusbandPhone(p.getHusbandPhone());
597 600  
598   - result.setHusbandCertificateTypeId(p.getHcertificateTypeId());
599   - result.setHusbandCertificateNum(p.getHcertificateNum());
600   - result.setHusbandCountryId(p.getHcountryId());
601   - result.setHusbandNationId(p.getHnationId());
602   - result.setHusbandProfessionTypeId(p.getHprofessionTypeId());
603   - result.setHusbandWorkUnit(p.getHworkUnit());
604   - result.setHusbandLevelTypeId(p.getHlevelTypeId());
  601 + result.setChildbirthAddr(p.getAddressPostRest());
  602 + result.setChildbirthProvinceId(p.getProvincePostRestId());
  603 + result.setChildbirthCityId(p.getCityPostRestId());
  604 + result.setChildbirthAreaId(p.getAreaPostRestId());
  605 + result.setChildbirthStreetId(p.getStreetPostRestId());
605 606  
606   - result.setHusbandAddressRegister(p.getHaddressRegister());
607   - result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId());
608   - result.setHusbandCityRegisterId(p.getHcityRegisterId());
609   - result.setHusbandAreaRegisterId(p.getHareaRegisterId());
610   - result.setHusbandStreetRegisterId(p.getHstreetRegisterId());
  607 + /****************丈夫信息**************/
  608 + result.setHusbandName(p.getHusbandName());
  609 + result.setHusbandPhone(p.getHusbandPhone());
611 610  
612   - result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus()));
613   - result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
614   - result.setExpVip(p.getExpVip());
615   - result.setMremark(p.getMremark());
  611 + result.setHusbandCertificateTypeId(p.getHcertificateTypeId());
  612 + result.setHusbandCertificateNum(p.getHcertificateNum());
  613 + result.setHusbandCountryId(p.getHcountryId());
  614 + result.setHusbandNationId(p.getHnationId());
  615 + result.setHusbandProfessionTypeId(p.getHprofessionTypeId());
  616 + result.setHusbandWorkUnit(p.getHworkUnit());
  617 + result.setHusbandLevelTypeId(p.getHlevelTypeId());
616 618  
  619 + result.setHusbandAddressRegister(p.getHaddressRegister());
  620 + result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId());
  621 + result.setHusbandCityRegisterId(p.getHcityRegisterId());
  622 + result.setHusbandAreaRegisterId(p.getHareaRegisterId());
  623 + result.setHusbandStreetRegisterId(p.getHstreetRegisterId());
617 624  
618   - //院内信息
619   - result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
620   - result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate()));
621   - result.setFileCode(p.getFileCode());
622   - result.setVcCardNo(p.getVcCardNo());
623   - result.setBookbuildingDoctor(p.getBookbuildingDoctor());
624   - result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
625   - result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
  625 + result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus()));
  626 + result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
  627 + result.setExpVip(p.getExpVip());
  628 + result.setMremark(p.getMremark());
626 629  
627   - result.setExpType(p.getExpType());
628 630  
629   - result.setPid(p.getPid());
630   - }
631   - BaseObjectResponse objectResponse = new BaseObjectResponse();
632   - objectResponse.setData(result);
633   - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
634   - objectResponse.setErrormsg("成功");
635   - return objectResponse;
  631 + //院内信息
  632 + result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
  633 + result.setDueDate(DateUtil.getyyyy_MM_dd(p.getDueDate()));
  634 + result.setFileCode(p.getFileCode());
  635 + result.setVcCardNo(p.getVcCardNo());
  636 + result.setBookbuildingDoctor(p.getBookbuildingDoctor());
  637 + result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
  638 + result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
  639 +
  640 + result.setExpType(p.getExpType());
  641 +
  642 + result.setPid(p.getPid());
636 643 }
637 644  
638 645 /**
... ... @@ -733,7 +740,7 @@
733 740 }
734 741 else
735 742 {
736   - objectResponse.setData(pat);
  743 + objectResponse.setData(getResult(pat));
737 744 }
738 745  
739 746 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ ad8aaad
... ... @@ -24,6 +24,9 @@
24 24 //母亲联系方式
25 25 private String mommnyPhone;
26 26  
  27 + //母亲加密联系方式
  28 + private String mommnyEncryptPhone;
  29 +
27 30 //下次儿保时间
28 31 private String nextDate;
29 32  
... ... @@ -38,6 +41,14 @@
38 41  
39 42 //诊断
40 43 private String diagnose;
  44 +
  45 + public String getMommnyEncryptPhone() {
  46 + return mommnyEncryptPhone;
  47 + }
  48 +
  49 + public void setMommnyEncryptPhone(String mommnyEncryptPhone) {
  50 + this.mommnyEncryptPhone = mommnyEncryptPhone;
  51 + }
41 52  
42 53 public String getDiagnose() {
43 54 return diagnose;