jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 97a0bca3b79086d9ffbb3b5c3874d31c49a2afb4

Authored by shiyang
1 parent 9c292d1cd9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

2022-6-10 出生证数据对接D301-新加8个字段

Showing 2 changed files with 34 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 97a0bca
... ... @@ -140,6 +140,7 @@
140 140 private String hcityId;
141 141 private String hareaId;
142 142 private String hstreetId;
  143 + //村
143 144 private String hvillage;
144 145 private String haddress;
145 146  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 97a0bca
... ... @@ -3401,6 +3401,39 @@
3401 3401 map.put("FQHJQHDM", organizationService.getAreaCode(FQHJQX));
3402 3402 //父 亲 住 址 行 政 区 划 代 码
3403 3403 map.put("FQ_ZZXZQHDM", organizationService.getAreaCode(FQZZQX));
  3404 +
  3405 + /**2022-6-10 新加8个字段 **/
  3406 + //母亲户籍所在地-乡镇/街道
  3407 + String MQHJXZ = CommonsHelper.getName1(patient.getStreetId(), basicConfigService);
  3408 + map.put("MQHJXZ", StringUtils.isEmpty(MQHJXZ) ? "/" : MQHJXZ);
  3409 + //母亲户籍所在地-村/居委会
  3410 + map.put("MQHJCUN", "/");
  3411 + //母亲户籍所在地-门牌号
  3412 + map.put("MQHJMPH", StringUtils.isEmpty(patient.getAddress()) ? "/" : patient.getAddress());
  3413 + //父亲户籍所在地-乡镇/街道
  3414 + String FQHJXZ = CommonsHelper.getName1(patient.getHstreetRegisterId(), basicConfigService);
  3415 + map.put("FQHJXZ", StringUtils.isEmpty(FQHJXZ) ? "/" : FQHJXZ);
  3416 + //父亲户籍所在地-村/居委会
  3417 + map.put("FQHJCUN", "/");
  3418 + //父亲户籍所在地-门牌号
  3419 + map.put("FQHJMPH", StringUtils.isEmpty(patient.getHaddressRegister()) ? "/" : patient.getHaddressRegister());
  3420 + //母亲证面地址详情，必填。单亲无母亲信息填“/”(出生证上面取得是户籍地)
  3421 + String MQZMDZXQ="/";
  3422 + if(StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) &&
  3423 + StringUtils.isNotEmpty(patient.getAreaId()) && StringUtils.isNotEmpty(patient.getStreetId()) &&
  3424 + StringUtils.isNotEmpty(patient.getAddress())){
  3425 + MQZMDZXQ= CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService);
  3426 + }
  3427 + map.put("MQZMDZXQ",MQZMDZXQ);
  3428 + //父亲证面地址详情，必填，单亲无父亲信息填“/”(出生证上面取得是户籍地)
  3429 + String FQZMDZXQ="/";
  3430 + if(StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) &&
  3431 + StringUtils.isNotEmpty(patient.getHareaRegisterId()) && StringUtils.isNotEmpty(patient.getHstreetRegisterId()) &&
  3432 + StringUtils.isNotEmpty(patient.getHaddressRegister())){
  3433 + FQZMDZXQ= CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService);
  3434 + }
  3435 + map.put("FQZMDZXQ",null);
  3436 +
3404 3437 }
3405 3438 return map;
3406 3439 }