jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ccd3a7cc4d28018d63e769be7f2260ec28528b68

Authored by landong2015
1 parent 0d62cad68d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

update

Showing 1 changed file with 10 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ ccd3a7c
... ... @@ -192,7 +192,7 @@
192 192 if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){
193 193 //判断该证件号码是否在该医院建档
194 194 query.setCertificateNum(addRequest.getCertificateNum());
195   -// query.setCertificateTypeId(addRequest.getCertificateTypeId());
  195 + query.setCertificateTypeId(addRequest.getCertificateTypeId());
196 196 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
197 197 if (CollectionUtils.isNotEmpty(modelList)){
198 198 ResidentsArchiveModel archiveModel = modelList.get(0);
... ... @@ -265,6 +265,7 @@
265 265 if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) {
266 266 //判断该证件号码是否在该医院建档
267 267 query.setCertificateNum(addRequest.getCertificateNum());
  268 + query.setCertificateTypeId(addRequest.getCertificateTypeId());
268 269 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
269 270 if (CollectionUtils.isNotEmpty(modelList)){
270 271 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
... ... @@ -285,6 +286,7 @@
285 286  
286 287 if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){
287 288 query.setCertificateNum(null);
  289 + query.setPhone(null);
288 290 //判断该就诊卡号是否在该医院建档
289 291 query.setVcCardNo(addRequest.getVcCardNo());
290 292 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
... ... @@ -456,6 +458,8 @@
456 458  
457 459 List<Map> data = new ArrayList<>();
458 460  
  461 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  462 +
459 463 //查询条件
460 464 ResidentsArchiveQuery query = new ResidentsArchiveQuery();
461 465 query.setLimit(queryRequest.getLimit());
... ... @@ -463,6 +467,10 @@
463 467 query.setNeed(need);
464 468 query.setYn(YnEnums.YES.getId());
465 469  
  470 + if (hospitalId!=null){
  471 + query.setHospitalId(hospitalId);
  472 + }
  473 +
466 474 //只查询女性
467 475 query.setSex(SystemConfig.WOMAN_ID);
468 476  
... ... @@ -471,7 +479,7 @@
471 479 query.setAreaId(queryRequest.getAreaId());
472 480 query.setVcCardNo(queryRequest.getVcCardNo());
473 481 query.setCertificateNum(queryRequest.getCardNo());
474   -// query.setCertificateTypeId(queryRequest.getCertificateTypeId());
  482 + query.setCertificateTypeId(queryRequest.getCertificateTypeId());
475 483 query.setUsername(queryRequest.getUsername());
476 484 query.setPhone(queryRequest.getPhone());
477 485