fangcheng / regional-platform

Download as
Browse Code »

Commit 3debb5d085d70545ac113ad8f3015667f9ad8b23

Authored by jiangjiazhi
2 parents d7fe0a9b85 3542470136
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ 3debb5d
... ... @@ -127,6 +127,9 @@
127 127 if (StringUtils.isNotBlank(areaId)) {
128 128 condition = condition.and("areaId", areaId, MongoOper.IS);
129 129 }
  130 + if (StringUtils.isNotBlank(vcCardNo)) {
  131 + condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
  132 + }
130 133 if (yn !=null) {
131 134 condition = condition.and("yn", yn, MongoOper.IS);
132 135 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 3debb5d
... ... @@ -494,6 +494,12 @@
494 494 }
495 495  
496 496 users.setOrganizations(organizations);
  497 +
  498 + List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(users.getId());
  499 + if (permissionsModelList != null && permissionsModelList.size() > 0) {
  500 + users.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
  501 + }
  502 +
497 503 Map<String, Object> map = new HashMap<>();
498 504 map.put("user", users);
499 505 map.put("roles", roles);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 3debb5d
... ... @@ -180,7 +180,7 @@
180 180 if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){
181 181 //判断该证件号码是否在该医院建档
182 182 query.setCertificateNum(addRequest.getCertificateNum());
183   - query.setCertificateTypeId(addRequest.getCertificateTypeId());
  183 +// query.setCertificateTypeId(addRequest.getCertificateTypeId());
184 184 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
185 185 if (CollectionUtils.isNotEmpty(modelList)){
186 186 ResidentsArchiveModel archiveModel = modelList.get(0);
187 187  
... ... @@ -241,11 +241,20 @@
241 241 if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) {
242 242 //判断该证件号码是否在该医院建档
243 243 query.setCertificateNum(addRequest.getCertificateNum());
244   - query.setCertificateTypeId(addRequest.getCertificateTypeId());
245 244 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
246 245 if (CollectionUtils.isNotEmpty(modelList)){
247 246 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
248 247 br.setErrormsg("该证件号在医院已经建档");
  248 + return br;
  249 + }
  250 + }
  251 +
  252 + if (StringUtils.isNotEmpty(addRequest.getPhone())){
  253 + query.setPhone(addRequest.getPhone());
  254 + List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
  255 + if (CollectionUtils.isNotEmpty(modelList)){
  256 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  257 + br.setErrormsg("该手机号在医院已经建档");
249 258 return br;
250 259 }
251 260 }