shiyang / regional-platform

Download as
Browse Code »

Commit bb00fedad19653e91e037e41520eb5bf0184118d

Authored by jiangjiazhi
1 parent 095422ea96
Exists in master and in 1 other branch nobuildprocess

地址加上省市区

Showing 3 changed files with 12 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java View file @ bb00fed
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3   -import com.lyms.platform.biz.service.BabyService;
4   -import com.lyms.platform.biz.service.CommunityConfigService;
5   -import com.lyms.platform.biz.service.PatientsService;
6   -import com.lyms.platform.biz.service.PuerperaService;
  3 +import com.lyms.platform.biz.service.*;
7 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 5 import com.lyms.platform.common.enums.YnEnums;
9 6 import com.lyms.platform.common.result.BaseListResponse;
... ... @@ -12,6 +9,7 @@
12 9 import com.lyms.platform.operate.web.request.BabyManagerQueryRequest;
13 10 import com.lyms.platform.operate.web.request.BabyManagerUpdateRequest;
14 11 import com.lyms.platform.operate.web.result.BabyResult;
  12 +import com.lyms.platform.operate.web.utils.CommonsHelper;
15 13 import com.lyms.platform.pojo.BabyModel;
16 14 import com.lyms.platform.pojo.CommunityConfig;
17 15 import com.lyms.platform.pojo.Patients;
... ... @@ -41,6 +39,8 @@
41 39 private BabyService babyService;
42 40 @Autowired
43 41 private VisitFacade visitFacade;
  42 + @Autowired
  43 + private BasicConfigService basicConfigService;
44 44  
45 45 /**
46 46 * 根据条件查询符合条件的新生儿
... ... @@ -190,7 +190,7 @@
190 190 addr = "";
191 191 }
192 192 }*/
193   - babyResult.setAddress(patients.getAddress());
  193 + babyResult.setAddress(CommonsHelper.getFullAddress(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getAddress(),basicConfigService));
194 194  
195 195 babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId);
196 196 String comm = "未分配";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ bb00fed
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.lyms.platform.biz.service.BabyService;
  4 +import com.lyms.platform.biz.service.BasicConfigService;
4 5 import com.lyms.platform.biz.service.CommunityConfigService;
5 6 import com.lyms.platform.biz.service.PatientsService;
6 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -13,6 +14,7 @@
13 14 import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
14 15 import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
15 16 import com.lyms.platform.operate.web.result.PuerperaResult;
  17 +import com.lyms.platform.operate.web.utils.CommonsHelper;
16 18 import com.lyms.platform.pojo.BabyModel;
17 19 import com.lyms.platform.pojo.CommunityConfig;
18 20 import com.lyms.platform.pojo.Patients;
19 21  
... ... @@ -41,8 +43,9 @@
41 43 private VisitFacade visitFacade;
42 44 @Autowired
43 45 private BabyService babyService;
  46 +@Autowired
  47 + private BasicConfigService basicConfigService;
44 48  
45   -
46 49 /**
47 50 * 修改产妇的社区
48 51 *
... ... @@ -142,6 +145,7 @@
142 145 }
143 146 }
144 147 String tips = visitFacade.getFindTips(model.getId(),Boolean.TRUE);
  148 + String addr= CommonsHelper.getFullAddress(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getAddress(), basicConfigService);
145 149 data.add(result.convertToResult(model, comm, tips));
146 150 }
147 151 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java View file @ bb00fed
... ... @@ -127,7 +127,7 @@
127 127 return this;
128 128 }
129 129  
130   - public PuerperaResult convertToResult(Patients model,String comm,String tips) {
  130 + public PuerperaResult convertToResult(Patients model,String comm,String tips,String addr) {
131 131 /* String addr = "";
132 132 if (StringUtils.isNotEmpty(model.getAddress())) {
133 133 try {
... ... @@ -137,7 +137,7 @@
137 137 addr = "";
138 138 }
139 139 }*/
140   - setAddress(model.getAddress());
  140 + setAddress(addr);
141 141 setId(model.getId());
142 142 setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
143 143 setVisit(tips);