Commit 6474741823eca3ff2dd7b0b2286132d214d153f2
1 parent
413b84192c
Exists in
master
and in
6 other branches
衡水导出
Showing 1 changed file with 9 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
6474741
| ... | ... | @@ -105,18 +105,22 @@ |
| 105 | 105 | childbirthManagerQueryModel.setPatientId(patients.getId()); |
| 106 | 106 | // 居住地 |
| 107 | 107 | if (initQuery.contains("address")) { |
| 108 | - childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); | |
| 108 | + | |
| 109 | + String liveAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), | |
| 110 | + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); | |
| 111 | + | |
| 112 | + childbirthManagerQueryModel.setAddress(liveAddress); | |
| 109 | 113 | } |
| 110 | 114 | //产后修养地址 |
| 111 | 115 | if (initQuery.contains("postAddress")) { |
| 112 | - childbirthManagerQueryModel.setPostAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), | |
| 113 | - patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService)); | |
| 116 | + childbirthManagerQueryModel.setPostAddress( CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), | |
| 117 | + patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService)); | |
| 114 | 118 | } |
| 115 | 119 | |
| 116 | 120 | // 户籍地址 |
| 117 | 121 | if (initQuery.contains("registerAddress")) { |
| 118 | - childbirthManagerQueryModel.setPostAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), | |
| 119 | - patients.getStreetId(), patients.getAddress(), basicConfigService)); | |
| 122 | + childbirthManagerQueryModel.setRegisterAddress( CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), | |
| 123 | + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); | |
| 120 | 124 | } |
| 121 | 125 | |
| 122 | 126 | //带* |