jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b9dd8df3d0af6a0b485350207a2fc9f53c62d21d

Authored by jiangjiazhi
1 parent 99165af02b
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

座机号 替换的问题

Showing 2 changed files with 55 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ b9dd8df
... ... @@ -1398,6 +1398,11 @@
1398 1398 patientResult.setPregnantLiveAreaId(result.getPregnantLiveAreaId());
1399 1399 patientResult.setPregnantLiveStreetId(result.getPregnantLiveStreetId());
1400 1400  
  1401 +
  1402 + patientResult.setPregnantLiveProvince(getBasicConfig(result.getPregnantLiveProvinceId()));
  1403 + patientResult.setPregnantLiveCity(getBasicConfig(result.getPregnantLiveAreaId()));
  1404 + patientResult.setPregnantLiveArea(getBasicConfig(result.getPregnantLiveAreaId()));
  1405 + patientResult.setPregnantLiveStreet(getBasicConfig(result.getPregnantLiveStreetId()));
1401 1406 patientResult.setHusbandName(result.getHusbandName());
1402 1407 //丈夫证件号
1403 1408 if(StringUtils.isNotEmpty(result.getHusbandCertificateNum()) &&result.getHusbandCertificateNum().length()==18){
... ... @@ -1427,6 +1432,16 @@
1427 1432 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1428 1433 objectResponse.setErrormsg("成功");
1429 1434 return objectResponse;
  1435 + }
  1436 + private String getBasicConfig(String id){
  1437 + if(StringUtils.isEmpty(id)){
  1438 + return "";
  1439 + }
  1440 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
  1441 + if(null!=basicConfig){
  1442 + return basicConfig.getName();
  1443 + }
  1444 + return "";
1430 1445 }
1431 1446 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimplePregnantResult.java View file @ b9dd8df
... ... @@ -6,9 +6,11 @@
6 6 public class SimplePregnantResult {
7 7 private String id;
8 8 private String pid;
9   -
  9 + //孕妇名字
10 10 private String pregnantName;
  11 + //孕妇年龄
11 12 private String pregnantAge;
  13 + //孕妇手机号码
12 14 private String pregnantPhone;
13 15  
14 16 //居住地
15 17  
... ... @@ -18,7 +20,12 @@
18 20 private String pregnantLiveAreaId;
19 21 private String pregnantLiveStreetId;
20 22  
  23 + private String pregnantLiveProvince;
  24 + private String pregnantLiveCity;
  25 + private String pregnantLiveArea;
  26 + private String pregnantLiveStreet;
21 27  
  28 +
22 29 //丈夫姓名
23 30 private String husbandName;
24 31 //丈夫年龄
... ... @@ -40,6 +47,38 @@
40 47  
41 48 public String getPid() {
42 49 return pid;
  50 + }
  51 +
  52 + public String getPregnantLiveProvince() {
  53 + return pregnantLiveProvince;
  54 + }
  55 +
  56 + public void setPregnantLiveProvince(String pregnantLiveProvince) {
  57 + this.pregnantLiveProvince = pregnantLiveProvince;
  58 + }
  59 +
  60 + public String getPregnantLiveCity() {
  61 + return pregnantLiveCity;
  62 + }
  63 +
  64 + public void setPregnantLiveCity(String pregnantLiveCity) {
  65 + this.pregnantLiveCity = pregnantLiveCity;
  66 + }
  67 +
  68 + public String getPregnantLiveArea() {
  69 + return pregnantLiveArea;
  70 + }
  71 +
  72 + public void setPregnantLiveArea(String pregnantLiveArea) {
  73 + this.pregnantLiveArea = pregnantLiveArea;
  74 + }
  75 +
  76 + public String getPregnantLiveStreet() {
  77 + return pregnantLiveStreet;
  78 + }
  79 +
  80 + public void setPregnantLiveStreet(String pregnantLiveStreet) {
  81 + this.pregnantLiveStreet = pregnantLiveStreet;
43 82 }
44 83  
45 84 public void setPid(String pid) {