fangcheng / regional-platform

Download as
Browse Code »

Commit 7e32d0ad5437d56876161f0e1456f1e96d5b3e0b

Authored by landong2015
1 parent 29a0e83b34
Exists in master and in 1 other branch nobuildprocess

update

Showing 1 changed file with 24 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 7e32d0a
... ... @@ -164,12 +164,12 @@
164 164 * @param request
165 165 * @return
166 166 */
167   - public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
  167 + public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request) {
168 168  
169   - List<String> parentIds = new ArrayList<>();
  169 + List<String> parentIds = null;
170 170  
171 171 //用姓名和联系方式查询到的居民建档ID
172   - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())){
  172 + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())) {
173 173 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
174 174 archiveQuery.setYn(YnEnums.YES.getId());
175 175 archiveQuery.setUsername(request.getUsername());
176 176  
... ... @@ -177,10 +177,13 @@
177 177 archiveQuery.setPhone(request.getPhone());
178 178 archiveQuery.setHospitalId(request.getHospitalId());
179 179 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
180   - if (CollectionUtils.isNotEmpty(modelList)){
181   - for (ResidentsArchiveModel model : modelList){
  180 + parentIds = new ArrayList<>();
  181 + if (CollectionUtils.isNotEmpty(modelList)) {
  182 + for (ResidentsArchiveModel model : modelList) {
182 183 parentIds.add(model.getId());
183 184 }
  185 + }else {
  186 + parentIds.add("-1");
184 187 }
185 188 }
186 189 PremaritalCheckupQuery query = new PremaritalCheckupQuery();
187 190  
188 191  
... ... @@ -188,14 +191,15 @@
188 191 query.setLimit(request.getLimit());
189 192 query.setNeed("y");
190 193 query.setYn(YnEnums.YES.getId());
  194 +
191 195 query.setYiXueYiJian(request.getYiXueYiJian());
192 196  
193   - if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
  197 + if (StringUtils.isNotEmpty(request.getPremaritalUpTime())) {
194 198 String[] dates = request.getPremaritalUpTime().split(" - ");
195 199 query.setPremaritalUpTimeStart(DateUtil.parseYMD(dates[0]));
196   - if(dates.length>=2){
197   - Date date= DateUtil.parseYMD(dates[1]);
198   - if(null!=date){
  200 + if (dates.length >= 2) {
  201 + Date date = DateUtil.parseYMD(dates[1]);
  202 + if (null != date) {
199 203 long d = date.getTime() + 86398000;
200 204 date = new Date(d);
201 205 }
202 206  
203 207  
204 208  
205 209  
206 210  
207 211  
... ... @@ -204,28 +208,28 @@
204 208 }
205 209 query.setSexType(request.getSexType());
206 210  
207   - if (CollectionUtils.isNotEmpty(parentIds)){
  211 + if (parentIds!=null) {
208 212 query.setParentIds(parentIds);
209 213 }
210 214  
211 215 List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
212 216 List<Map> list = new ArrayList<>();
213   - if (CollectionUtils.isNotEmpty(data)){
214   - for (PremaritalCheckup checkup : data){
215   - Map<String,Object> map = new HashMap<>();
  217 + if (CollectionUtils.isNotEmpty(data)) {
  218 + for (PremaritalCheckup checkup : data) {
  219 + Map<String, Object> map = new HashMap<>();
216 220 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
217   - map.put("premaritalUpTime", checkup.getPremaritalUpTime());
  221 + map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
218 222 map.put("username", model.getUsername());
219   - map.put("certificateNum",model.getCertificateNum());
  223 + map.put("certificateNum", model.getCertificateNum());
220 224 map.put("phone", model.getPhone());
221   - if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo()== PhysiologyStatusEnum.NORMAL.getId()){
  225 + if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
222 226 map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
223   - }else {
  227 + } else {
224 228 map.put("jianChaJieGuo", checkup.getJianChaDetails());
225 229 }
226   - map.put("yiXueYiJian", checkup.getYiXueYiJian() ==null ? "" :MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
227   - map.put("residence", CommonsHelper.getResidence(model.getProvinceId(),model.getCityId(),model.getAreaId(),model.getStreetId(),
228   - model.getAddress(),basicConfigService));
  230 + map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
  231 + map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
  232 + model.getAddress(), basicConfigService));
229 233 map.put("hunJianDoctor", checkup.getHunJianDoctor());
230 234 map.put("id", checkup.getId());
231 235 list.add(map);